Pull acpica into release branch

[pandora-kernel.git] / drivers / media / video / tveeprom.c

diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index e0d2ff8..b463e99 100644 (file)
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -218,7 +218,7 @@ hauppauge_tuner[] =
        /* 110-119 */
        { TUNER_ABSENT,        "Thompson DTT75105"},
        { TUNER_ABSENT,        "Conexant_CX24109"},
-       { TUNER_ABSENT,        "TCL M2523_5N_E"},
+       { TUNER_TCL_2002N,     "TCL M2523_5N_E"},
        { TUNER_ABSENT,        "TCL M2523_3DB_E"},
        { TUNER_ABSENT,        "Philips 8275A"},
        { TUNER_ABSENT,        "Microtune MT2060"},
@@ -757,9 +757,9 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
 static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
-       if (adapter->id != I2C_HW_B_BT848)
-               return 0;
-       return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
+       if (adapter->class & I2C_CLASS_TV_ANALOG)
+               return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
+       return 0;
 }
 
 static int