aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/m5602/m5602_ov7660.c
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 /drivers/media/video/gspca/m5602/m5602_ov7660.c
parent7b8265033d3ca5425e4fbdb77f9ccd3375f3f117 (diff)
downloadkernel_samsung_smdk4412-72b79747a88f1ffcb6689cedacc01235bb545cd6.zip
kernel_samsung_smdk4412-72b79747a88f1ffcb6689cedacc01235bb545cd6.tar.gz
kernel_samsung_smdk4412-72b79747a88f1ffcb6689cedacc01235bb545cd6.tar.bz2
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>
Diffstat (limited to 'drivers/media/video/gspca/m5602/m5602_ov7660.c')
-rw-r--r--drivers/media/video/gspca/m5602/m5602_ov7660.c2
1 files changed, 1 insertions, 1 deletions
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,