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

[safe/jmp/linux-2.6] / drivers / media / video / gspca / m5602 / m5602_ov7660.h

diff --git a/drivers/media/video/gspca/m5602/m5602_ov7660.h b/drivers/media/video/gspca/m5602/m5602_ov7660.h
index 570715f..3f2c169 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},