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/gl520sm.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'drivers/hwmon/gl520sm.c')
| -rw-r--r-- | drivers/hwmon/gl520sm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c index c39ba1239426..baee60e44b52 100644 --- a/drivers/hwmon/gl520sm.c +++ b/drivers/hwmon/gl520sm.c | |||
| @@ -109,10 +109,10 @@ static struct gl520_data *gl520_update_device(struct device *dev); | |||
| 109 | 109 | ||
| 110 | /* Driver data */ | 110 | /* Driver data */ |
| 111 | static struct i2c_driver gl520_driver = { | 111 | static struct i2c_driver gl520_driver = { |
| 112 | .owner = THIS_MODULE, | 112 | .driver = { |
| 113 | .name = "gl520sm", | 113 | .name = "gl520sm", |
| 114 | }, | ||
| 114 | .id = I2C_DRIVERID_GL520, | 115 | .id = I2C_DRIVERID_GL520, |
| 115 | .flags = I2C_DF_NOTIFY, | ||
| 116 | .attach_adapter = gl520_attach_adapter, | 116 | .attach_adapter = gl520_attach_adapter, |
| 117 | .detach_client = gl520_detach_client, | 117 | .detach_client = gl520_detach_client, |
| 118 | }; | 118 | }; |