diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-12-10 17:29:47 -0200 |
| commit | c3e004458c858a5cea7dc5a693c25b301c0a47a8 (patch) | |
| tree | b7aced58dd900d9afd01531ffefd1b00dffda92c /linux/drivers/media/video/wm8739.c | |
| parent | df971dfe066837946222937b94068df80d1270f2 (diff) | |
| parent | 73718ca8bbd9619f9d42780499c63b32fd074052 (diff) | |
| download | mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.gz mediapointer-dvb-s2-c3e004458c858a5cea7dc5a693c25b301c0a47a8.tar.bz2 | |
merge backout patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/wm8739.c')
| -rw-r--r-- | linux/drivers/media/video/wm8739.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/wm8739.c b/linux/drivers/media/video/wm8739.c index a0a4ed3ba..36babfdb2 100644 --- a/linux/drivers/media/video/wm8739.c +++ b/linux/drivers/media/video/wm8739.c @@ -42,7 +42,6 @@ MODULE_AUTHOR("T. Adachi, Hans Verkuil"); MODULE_LICENSE("GPL"); static int debug; -static unsigned short normal_i2c[] = { 0x34 >> 1, 0x36 >> 1, I2C_CLIENT_END }; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) module_param(debug, int, 0644); @@ -52,11 +51,15 @@ MODULE_PARM(debug, "i"); MODULE_PARM_DESC(debug, "Debug level (0-1)"); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22) +static unsigned short normal_i2c[] = { 0x34 >> 1, 0x36 >> 1, I2C_CLIENT_END }; + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; #endif I2C_CLIENT_INSMOD; +#endif /* ------------------------------------------------------------------------ */ |