diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-25 17:08:48 -0600 |
| commit | bdf583dd1cbec85e2760a6825d3ddf571c791870 (patch) | |
| tree | a97b66970f20ce2330816ca2a5e3d405a293c7ed /linux/drivers/media/video/tda9840.c | |
| parent | 52e19741ce48048ada5cc3b87c065dec5b100b8d (diff) | |
| parent | afb2abb44347c884e3a8a2ddf7151756c1869d2f (diff) | |
| download | mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.gz mediapointer-dvb-s2-bdf583dd1cbec85e2760a6825d3ddf571c791870.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/tda9840.c')
| -rw-r--r-- | linux/drivers/media/video/tda9840.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/video/tda9840.c b/linux/drivers/media/video/tda9840.c index 9cc13ec8e..42a842aec 100644 --- a/linux/drivers/media/video/tda9840.c +++ b/linux/drivers/media/video/tda9840.c @@ -44,8 +44,11 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off)."); #define TEST 0x04 /* addresses to scan, found only at 0x42 (7-Bit) */ -static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END }; +static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, 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; |