summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Andrén <erik.andren@gmail.com>2009-01-28 13:14:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-16 18:20:49 -0300
commit72b79747a88f1ffcb6689cedacc01235bb545cd6 (patch)
tree0bee0dcda99d755cbd8ea7d017822abdd9c5db52
parent7b8265033d3ca5425e4fbdb77f9ccd3375f3f117 (diff)
downloadop-kernel-dev-72b79747a88f1ffcb6689cedacc01235bb545cd6.zip
op-kernel-dev-72b79747a88f1ffcb6689cedacc01235bb545cd6.tar.gz
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>
-rw-r--r--drivers/media/video/gspca/m5602/m5602_mt9m111.c2
-rw-r--r--drivers/media/video/gspca/m5602/m5602_mt9m111.h2
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov7660.c2
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov7660.h12
4 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/m5602/m5602_mt9m111.c b/drivers/media/video/gspca/m5602/m5602_mt9m111.c
index 5e8d8183..0c9470e 100644
--- 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 716aba5..e71ddb7 100644
--- 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 bfa28de..7aafeb7 100644
--- 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 570715f..3f2c169 100644
--- 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},
OpenPOWER on IntegriCloud