diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-11 11:47:19 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-11 11:47:19 -0300 |
| commit | e03569293f52fc034e9e828bea0ee3a11c32d279 (patch) | |
| tree | 127210167bbbb56a41ae22d697326a97f1628c4e /linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h | |
| parent | b63d8b06ef18c93957810d2f1b8b5aaab133408c (diff) | |
| parent | 7acaa3024593445213e6f34a9305def3a1aa64a5 (diff) | |
| download | mediapointer-dvb-s2-e03569293f52fc034e9e828bea0ee3a11c32d279.tar.gz mediapointer-dvb-s2-e03569293f52fc034e9e828bea0ee3a11c32d279.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-move-zoran
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h')
| -rw-r--r-- | linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h index 5d808a750..48abc6c8b 100644 --- a/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h +++ b/linux/drivers/media/video/gspca/m5602/m5602_s5k4aa.h @@ -63,7 +63,7 @@ /* Kernel module parameters */ extern int force_sensor; extern int dump_sensor; -extern unsigned int debug; +extern unsigned int m5602_debug; int s5k4aa_probe(struct sd *sd); int s5k4aa_init(struct sd *sd); @@ -339,7 +339,11 @@ static const unsigned char init_s5k4aa[][4] = {SENSOR, S5K4AA_GAIN_2, 0xa0, 0x00} }; -static const struct dmi_system_id s5k4aa_vflip_dmi_table[] = { +static +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) + const +#endif + struct dmi_system_id s5k4aa_vflip_dmi_table[] = { { .ident = "Fujitsu-Siemens Amilo Xa 2528", .matches = { |