diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/hwmon/ams/ams-input.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/hwmon/ams/ams-input.c')
| -rw-r--r-- | drivers/hwmon/ams/ams-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c index f126aa485134..18210164e307 100644 --- a/drivers/hwmon/ams/ams-input.c +++ b/drivers/hwmon/ams/ams-input.c | |||
| @@ -153,7 +153,7 @@ int ams_input_init(void) | |||
| 153 | } | 153 | } |
| 154 | 154 | ||
| 155 | /* Call with ams_info.lock held! */ | 155 | /* Call with ams_info.lock held! */ |
| 156 | void ams_input_exit() | 156 | void ams_input_exit(void) |
| 157 | { | 157 | { |
| 158 | ams_input_disable(); | 158 | ams_input_disable(); |
| 159 | device_remove_file(&ams_info.of_dev->dev, &dev_attr_joystick); | 159 | device_remove_file(&ams_info.of_dev->dev, &dev_attr_joystick); |