Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / media / dvb / ttpci / budget-core.c

diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 18cac4b12ab28f73fb97a25f219788438b703bee..6f4ddb643fee12482ae84ab0f76939a4fd91999c 100644 (file)
--- 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,
        if (bi->type != BUDGET_FS_ACTIVY)
                saa7146_write(dev, GPIO_CTRL, 0x500000);        /* GPIO 3 = 1 */
 
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       budget->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL;
-#else
        budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
-#endif
 
        strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));