diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /drivers/media/video/adv7170.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/media/video/adv7170.c')
| -rw-r--r-- | drivers/media/video/adv7170.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index 1ca2b67aedfb..e61003de1d5f 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
| @@ -420,7 +420,6 @@ adv7170_detect_client (struct i2c_adapter *adapter, | |||
| 420 | client->addr = address; | 420 | client->addr = address; |
| 421 | client->adapter = adapter; | 421 | client->adapter = adapter; |
| 422 | client->driver = &i2c_driver_adv7170; | 422 | client->driver = &i2c_driver_adv7170; |
| 423 | client->flags = I2C_CLIENT_ALLOW_USE; | ||
| 424 | if ((client->addr == I2C_ADV7170 >> 1) || | 423 | if ((client->addr == I2C_ADV7170 >> 1) || |
| 425 | (client->addr == (I2C_ADV7170 >> 1) + 1)) { | 424 | (client->addr == (I2C_ADV7170 >> 1) + 1)) { |
| 426 | dname = adv7170_name; | 425 | dname = adv7170_name; |
| @@ -498,11 +497,11 @@ adv7170_detach_client (struct i2c_client *client) | |||
| 498 | /* ----------------------------------------------------------------------- */ | 497 | /* ----------------------------------------------------------------------- */ |
| 499 | 498 | ||
| 500 | static struct i2c_driver i2c_driver_adv7170 = { | 499 | static struct i2c_driver i2c_driver_adv7170 = { |
| 501 | .owner = THIS_MODULE, | 500 | .driver = { |
| 502 | .name = "adv7170", /* name */ | 501 | .name = "adv7170", /* name */ |
| 502 | }, | ||
| 503 | 503 | ||
| 504 | .id = I2C_DRIVERID_ADV7170, | 504 | .id = I2C_DRIVERID_ADV7170, |
| 505 | .flags = I2C_DF_NOTIFY, | ||
| 506 | 505 | ||
| 507 | .attach_adapter = adv7170_attach_adapter, | 506 | .attach_adapter = adv7170_attach_adapter, |
| 508 | .detach_client = adv7170_detach_client, | 507 | .detach_client = adv7170_detach_client, |