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/i2c/chips/ds1374.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/i2c/chips/ds1374.c')
| -rw-r--r-- | drivers/i2c/chips/ds1374.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/chips/ds1374.c b/drivers/i2c/chips/ds1374.c index da488b735abf..0710b9da9d54 100644 --- a/drivers/i2c/chips/ds1374.c +++ b/drivers/i2c/chips/ds1374.c | |||
| @@ -232,10 +232,10 @@ static int ds1374_detach(struct i2c_client *client) | |||
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | static struct i2c_driver ds1374_driver = { | 234 | static struct i2c_driver ds1374_driver = { |
| 235 | .owner = THIS_MODULE, | 235 | .driver = { |
| 236 | .name = DS1374_DRV_NAME, | 236 | .name = DS1374_DRV_NAME, |
| 237 | }, | ||
| 237 | .id = I2C_DRIVERID_DS1374, | 238 | .id = I2C_DRIVERID_DS1374, |
| 238 | .flags = I2C_DF_NOTIFY, | ||
| 239 | .attach_adapter = ds1374_attach, | 239 | .attach_adapter = ds1374_attach, |
| 240 | .detach_client = ds1374_detach, | 240 | .detach_client = ds1374_detach, |
| 241 | }; | 241 | }; |