diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/media/video/tveeprom.c | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/media/video/tveeprom.c')
| -rw-r--r-- | drivers/media/video/tveeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index 127ec38ebd60..3c3356a01cc6 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
| @@ -534,7 +534,7 @@ static int | |||
| 534 | tveeprom_attach_adapter (struct i2c_adapter *adapter) | 534 | tveeprom_attach_adapter (struct i2c_adapter *adapter) |
| 535 | { | 535 | { |
| 536 | dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id); | 536 | dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id); |
| 537 | if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848)) | 537 | if (adapter->id != I2C_HW_B_BT848) |
| 538 | return 0; | 538 | return 0; |
| 539 | return i2c_probe(adapter, &addr_data, tveeprom_detect_client); | 539 | return i2c_probe(adapter, &addr_data, tveeprom_detect_client); |
| 540 | } | 540 | } |