aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci')
-rw-r--r--drivers/media/dvb/ttpci/av7110.c4
-rw-r--r--drivers/media/dvb/ttpci/budget-core.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 865c4596b7b7..0777e8f9544b 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2471,11 +2471,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
2471 get recognized before the main driver is fully loaded */ 2471 get recognized before the main driver is fully loaded */
2472 saa7146_write(dev, GPIO_CTRL, 0x500000); 2472 saa7146_write(dev, GPIO_CTRL, 0x500000);
2473 2473
2474#ifdef I2C_ADAP_CLASS_TV_DIGITAL
2475 av7110->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
2476#else
2477 av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 2474 av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
2478#endif
2479 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); 2475 strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
2480 2476
2481 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ 2477 saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 18cac4b12ab2..6f4ddb643fee 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -497,11 +497,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
497 if (bi->type != BUDGET_FS_ACTIVY) 497 if (bi->type != BUDGET_FS_ACTIVY)
498 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ 498 saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */
499 499
500#ifdef I2C_ADAP_CLASS_TV_DIGITAL
501 budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
502#else
503 budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 500 budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
504#endif
505 501
506 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); 502 strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
507 503