diff options
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-i2c.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-i2c.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-i2c.c b/linux/drivers/media/video/bt8xx/bttv-i2c.c index 746b9dd77..4f48dfb26 100644 --- a/linux/drivers/media/video/bt8xx/bttv-i2c.c +++ b/linux/drivers/media/video/bt8xx/bttv-i2c.c @@ -33,9 +33,7 @@ #include "bttvp.h" #include <media/v4l2-common.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) #include <linux/jiffies.h> -#endif #include <asm/io.h> static int attach_inform(struct i2c_client *client); @@ -423,14 +421,10 @@ int __devinit init_bttv_i2c(struct bttv *btv) btv->c.i2c_adap.algo_data = &btv->i2c_algo; } btv->c.i2c_adap.owner = THIS_MODULE; -#ifdef I2C_CLASS_TV_ANALOG btv->c.i2c_adap.class = I2C_CLASS_TV_ANALOG; -#endif btv->c.i2c_adap.client_register = attach_inform; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,66) btv->c.i2c_adap.dev.parent = &btv->c.pci->dev; -#endif snprintf(btv->c.i2c_adap.name, sizeof(btv->c.i2c_adap.name), "bt%d #%d [%s]", btv->id, btv->c.nr, btv->use_i2c_hw ? "hw" : "sw"); @@ -438,12 +432,10 @@ int __devinit init_bttv_i2c(struct bttv *btv) i2c_set_adapdata(&btv->c.i2c_adap, btv); btv->i2c_client.adapter = &btv->c.i2c_adap; -#ifdef I2C_CLASS_TV_ANALOG if (bttv_tvcards[btv->c.type].no_video) btv->c.i2c_adap.class &= ~I2C_CLASS_TV_ANALOG; if (bttv_tvcards[btv->c.type].has_dvb) btv->c.i2c_adap.class |= I2C_CLASS_TV_DIGITAL; -#endif if (btv->use_i2c_hw) { btv->i2c_rc = i2c_add_adapter(&btv->c.i2c_adap); |