diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /drivers/macintosh/windfarm_lm75_sensor.c | |
parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/macintosh/windfarm_lm75_sensor.c')
-rw-r--r-- | drivers/macintosh/windfarm_lm75_sensor.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index fd16642d98ab..57460e46c89f 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c | |||
@@ -240,12 +240,7 @@ static int wf_lm75_detach(struct i2c_client *client) | |||
240 | 240 | ||
241 | static int __init wf_lm75_sensor_init(void) | 241 | static int __init wf_lm75_sensor_init(void) |
242 | { | 242 | { |
243 | int rc; | 243 | return i2c_add_driver(&wf_lm75_driver); |
244 | |||
245 | rc = i2c_add_driver(&wf_lm75_driver); | ||
246 | if (rc < 0) | ||
247 | return rc; | ||
248 | return 0; | ||
249 | } | 244 | } |
250 | 245 | ||
251 | static void __exit wf_lm75_sensor_exit(void) | 246 | static void __exit wf_lm75_sensor_exit(void) |