diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /drivers/media/video/tveeprom.c | |
parent | powerpc/ppc: export strncasecmp (diff) | |
parent | Linux v2.6.17-rc1 (diff) | |
download | linux-12df7556705aae97f24a397377e17898700d7192.tar.xz linux-12df7556705aae97f24a397377e17898700d7192.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/media/video/tveeprom.c')
-rw-r--r-- | drivers/media/video/tveeprom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index e0d2ff83fc91..431c3e2f6c42 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c @@ -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 |