diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-19 11:27:28 -0300 |
| commit | 9000c5024269dbd6f01e6cab6d8eaeb9f90b240f (patch) | |
| tree | 1c93ab6550a3bd97f73dcbcec36b28024e3254e5 /linux/drivers/media/video/tea6420.c | |
| parent | cff8dc200a5b837ab3961fc7077c3125d65c2fb2 (diff) | |
| parent | ef8a1e833862b224fbe194505d8a619ad1b13b92 (diff) | |
| download | mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.gz mediapointer-dvb-s2-9000c5024269dbd6f01e6cab6d8eaeb9f90b240f.tar.bz2 | |
Merge from http://linuxtv.org/hg/~mkrufky/pvrusb2
From: Mauro Carvalho Chehab <mchehab@infradead.org>
merge:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/tea6420.c')
| -rw-r--r-- | linux/drivers/media/video/tea6420.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tea6420.c b/linux/drivers/media/video/tea6420.c index d22eac01b..b5e41f49b 100644 --- a/linux/drivers/media/video/tea6420.c +++ b/linux/drivers/media/video/tea6420.c @@ -41,8 +41,11 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); do { if (debug) { printk("%s: %s()[%d]: ",__stringify(KBUILD_MODNAME), __FUNCTION__, __LINE__); printk(args); } } while (0) /* addresses to scan, found only at 0x4c and/or 0x4d (7-Bit) */ -static unsigned short normal_i2c[] = { I2C_TEA6420_1, I2C_TEA6420_2, I2C_CLIENT_END }; +static unsigned short normal_i2c[] = { I2C_ADDR_TEA6420_1, I2C_ADDR_TEA6420_2, I2C_CLIENT_END }; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) +static unsigned short normal_i2c_range[] = { I2C_CLIENT_END }; +#endif /* magic definition of all other variables and things */ I2C_CLIENT_INSMOD; |