diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:25:08 -0500 |
commit | 0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed (patch) | |
tree | 22c71657387b42787bc070502899a881ed909f39 /drivers/hwmon/gl518sm.c | |
parent | d8d8f6a4fd635dcc9e4f946394c1fbde85eeab66 (diff) | |
parent | ccf18968b1bbc2fb117190a1984ac2a826dac228 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'drivers/hwmon/gl518sm.c')
-rw-r--r-- | drivers/hwmon/gl518sm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c index 2f178dbe3d87..9e685e3a3bc9 100644 --- a/drivers/hwmon/gl518sm.c +++ b/drivers/hwmon/gl518sm.c | |||
@@ -151,10 +151,10 @@ static struct gl518_data *gl518_update_device(struct device *dev); | |||
151 | 151 | ||
152 | /* This is the driver that will be inserted */ | 152 | /* This is the driver that will be inserted */ |
153 | static struct i2c_driver gl518_driver = { | 153 | static struct i2c_driver gl518_driver = { |
154 | .owner = THIS_MODULE, | 154 | .driver = { |
155 | .name = "gl518sm", | 155 | .name = "gl518sm", |
156 | }, | ||
156 | .id = I2C_DRIVERID_GL518, | 157 | .id = I2C_DRIVERID_GL518, |
157 | .flags = I2C_DF_NOTIFY, | ||
158 | .attach_adapter = gl518_attach_adapter, | 158 | .attach_adapter = gl518_attach_adapter, |
159 | .detach_client = gl518_detach_client, | 159 | .detach_client = gl518_detach_client, |
160 | }; | 160 | }; |