diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2006-01-09 17:17:32 +0000 |
| commit | 6807eba35cc91e109fed1df6038c424496cf2add (patch) | |
| tree | 475351eb821b9e5a741faa5ba2f97e27cbf2e857 /linux/drivers/media/video/bttv-i2c.c | |
| parent | 1faa3dcb3917ba99177697e1b8b4473e388744f8 (diff) | |
| download | mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.gz mediapointer-dvb-s2-6807eba35cc91e109fed1df6038c424496cf2add.tar.bz2 | |
Several i2C cleanups to compile on both current linux and kernels >2.6.15
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/bttv-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/bttv-i2c.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/linux/drivers/media/video/bttv-i2c.c b/linux/drivers/media/video/bttv-i2c.c index af2ce2d28..fda9f34ea 100644 --- a/linux/drivers/media/video/bttv-i2c.c +++ b/linux/drivers/media/video/bttv-i2c.c @@ -1,5 +1,5 @@ /* - $Id: bttv-i2c.c,v 1.40 2006/01/08 12:05:34 mchehab Exp $ + $Id: bttv-i2c.c,v 1.41 2006/01/09 17:17:32 mchehab Exp $ bttv-i2c.c -- all the i2c code is here @@ -108,19 +108,13 @@ static struct i2c_algo_bit_data bttv_i2c_algo_bit_template = { }; static struct i2c_adapter bttv_i2c_adap_sw_template = { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) .owner = THIS_MODULE, #endif #ifdef I2C_CLASS_TV_ANALOG .class = I2C_CLASS_TV_ANALOG, #endif -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) - .name = "bt878", -#else - .driver = { - .name = "bt878", - }, -#endif + .name = "bttv", .id = I2C_HW_B_BT848, .client_register = attach_inform, }; @@ -287,19 +281,13 @@ static struct i2c_algorithm bttv_algo = { }; static struct i2c_adapter bttv_i2c_adap_hw_template = { -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0))&&(LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)) - .owner = THIS_MODULE, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) + .owner = THIS_MODULE, #endif #ifdef I2C_CLASS_TV_ANALOG .class = I2C_CLASS_TV_ANALOG, #endif -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15) .name = "bt878", -#else - .driver = { - .name = "bt878", - }, -#endif .id = I2C_HW_B_BT848 /* FIXME */, .algo = &bttv_algo, .client_register = attach_inform, |