Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input

[linux-2.6] / drivers / hwmon / ams / ams-input.c

diff --git a/drivers/hwmon/ams/ams-input.c b/drivers/hwmon/ams/ams-input.c
index f126aa4851346563b0e75fc6b2ee1db42e8746c6..18210164e307621c7edf41b3f51d221988b0899d 100644 (file)
--- a/drivers/hwmon/ams/ams-input.c
+++ b/drivers/hwmon/ams/ams-input.c
@@ -153,7 +153,7 @@ int ams_input_init(void)
 }
 
 /* Call with ams_info.lock held! */
-void ams_input_exit()
+void ams_input_exit(void)
 {
        ams_input_disable();
        device_remove_file(&ams_info.of_dev->dev, &dev_attr_joystick);