diff options
author | Jeff Garzik | 2005-09-08 11:43:49 +0200 |
---|---|---|
committer | Jeff Garzik | 2005-09-08 11:43:49 +0200 |
commit | 1d6ae775d7a948c9575658eb41184fd2e506c0df (patch) | |
tree | 8128a28e89d82f13bb8e3a2160382240c66e2816 /drivers/media/video/tea6420.c | |
parent | Merge /spare/repo/linux-2.6/ (diff) | |
parent | [SCSI] Re-do "final klist fixes" (diff) | |
download | kernel-qcow2-linux-1d6ae775d7a948c9575658eb41184fd2e506c0df.tar.gz kernel-qcow2-linux-1d6ae775d7a948c9575658eb41184fd2e506c0df.tar.xz kernel-qcow2-linux-1d6ae775d7a948c9575658eb41184fd2e506c0df.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/media/video/tea6420.c')
-rw-r--r-- | drivers/media/video/tea6420.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index 48d4db7d507b..17975c19da5e 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c @@ -135,7 +135,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind) static int attach(struct i2c_adapter *adapter) { /* let's see whether this is a know adapter we can attach to */ - if (adapter->id != I2C_ALGO_SAA7146) { + if (adapter->id != I2C_HW_SAA7146) { dprintk("refusing to probe on unknown adapter [name='%s',id=0x%x]\n", adapter->name, adapter->id); return -ENODEV; } @@ -177,7 +177,7 @@ static struct i2c_driver driver = { }; static struct i2c_client client_template = { - I2C_DEVNAME("tea6420"), + .name = "tea6420", .driver = &driver, }; |