V4L/DVB (11650): gspca - m5602: Sort out macro conflict by adding a prefix

Signed-off-by: Erik Andrén <erik.andren@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index 5e8d8183bb509edd0f66a42b6499c78e2edad2ba..0c9470e137e3bfd93f4e26bacefc75db7e3ffce1 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.c
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
@@ -86,7 +86,7 @@ const static struct ctrl mt9m111_ctrls[] = {
                        .minimum        = 0,
                        .maximum        = (INITIAL_MAX_GAIN - 1) * 2 * 2 * 2,
                        .step           = 1,
-                       .default_value  = DEFAULT_GAIN,
+                       .default_value  = MT9M111_DEFAULT_GAIN,
                        .flags          = V4L2_CTRL_FLAG_SLIDER
                },
                .set = mt9m111_set_gain,

diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.h b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
index 716aba523a1f3d1ec2d743e90f12ce19bfe09ed5..e71ddb786264dd2eae793813e6a5600037c5c0d9 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_mt9m111.h
+++ b/drivers/media/video/gspca/m5602/m5602_mt9m111.h
@@ -97,7 +97,7 @@
 #define MT9M111_2D_DEFECT_CORRECTION_ENABLE    (1 << 0)
 
 #define INITIAL_MAX_GAIN                       64
-#define DEFAULT_GAIN                           283
+#define MT9M111_DEFAULT_GAIN                   283
 #define MT9M111_GREEN_GAIN_DEFAULT             0x20
 #define MT9M111_BLUE_GAIN_DEFAULT              0x20
 #define MT9M111_RED_GAIN_DEFAULT               0x20

diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.c b/drivers/media/video/gspca/m5602/m5602_ov7660.c
index bfa28de6cbb0a5d689d9bf1656c426fbadb876f1..7aafeb7cfa07992734fe3b9eaf52df193ae4a054 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_ov7660.c
+++ b/drivers/media/video/gspca/m5602/m5602_ov7660.c
@@ -31,7 +31,7 @@ const static struct ctrl ov7660_ctrls[] = {
                        .minimum        = 0x00,
                        .maximum        = 0xff,
                        .step           = 0x1,
-                       .default_value  = DEFAULT_GAIN,
+                       .default_value  = OV7660_DEFAULT_GAIN,
                        .flags          = V4L2_CTRL_FLAG_SLIDER
                },
                .set = ov7660_set_gain,

diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.h b/drivers/media/video/gspca/m5602/m5602_ov7660.h
index 570715fff763e31a7ef5d079d3e875ca25378c0b..3f2c169a93eac382dade45cf1fe94579c6300145 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_ov7660.h
+++ b/drivers/media/video/gspca/m5602/m5602_ov7660.h
@@ -78,11 +78,11 @@
 #define OV7660_HV              0x69
 #define OV7660_RSVDA1          0xa1
 
-#define DEFAULT_GAIN           0x0e
-#define DEFAULT_RED_GAIN       0x80
-#define DEFAULT_BLUE_GAIN      0x80
-#define DEFAULT_SATURATION     0x00
-#define DEFAULT_EXPOSURE       0x20
+#define OV7660_DEFAULT_GAIN            0x0e
+#define OV7660_DEFAULT_RED_GAIN        0x80
+#define OV7660_DEFAULT_BLUE_GAIN       0x80
+#define OV7660_DEFAULT_SATURATION      0x00
+#define OV7660_DEFAULT_EXPOSURE        0x20
 
 /* Kernel module parameters */
 extern int force_sensor;
@@ -177,7 +177,7 @@ static const unsigned char init_ov7660[][4] =
        {BRIDGE, M5602_XB_SEN_CLK_DIV, 0x02},
        {BRIDGE, M5602_XB_SEN_CLK_CTRL, 0xb0},
 
-       {SENSOR, OV7660_AECH, DEFAULT_EXPOSURE},
+       {SENSOR, OV7660_AECH, OV7660_DEFAULT_EXPOSURE},
        {SENSOR, OV7660_COM1, 0x00},
 
        {BRIDGE, M5602_XB_GPIO_DIR, 0x01},