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/hwmon/adm9240.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/hwmon/adm9240.c')
| -rw-r--r-- | drivers/hwmon/adm9240.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c index 11dc95f8a17e..5ddc22fea4a3 100644 --- a/drivers/hwmon/adm9240.c +++ b/drivers/hwmon/adm9240.c | |||
| @@ -137,10 +137,10 @@ static struct adm9240_data *adm9240_update_device(struct device *dev); | |||
| 137 | 137 | ||
| 138 | /* driver data */ | 138 | /* driver data */ |
| 139 | static struct i2c_driver adm9240_driver = { | 139 | static struct i2c_driver adm9240_driver = { |
| 140 | .owner = THIS_MODULE, | 140 | .driver = { |
| 141 | .name = "adm9240", | 141 | .name = "adm9240", |
| 142 | }, | ||
| 142 | .id = I2C_DRIVERID_ADM9240, | 143 | .id = I2C_DRIVERID_ADM9240, |
| 143 | .flags = I2C_DF_NOTIFY, | ||
| 144 | .attach_adapter = adm9240_attach_adapter, | 144 | .attach_adapter = adm9240_attach_adapter, |
| 145 | .detach_client = adm9240_detach_client, | 145 | .detach_client = adm9240_detach_client, |
| 146 | }; | 146 | }; |