Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

[linux-2.6] / drivers / hwmon / ams / ams.h

diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h
index 240730e6bcde1c98f0b67862d8fb928c0d0d9ff9..a6221e5dd984292613634a6ddf28c775615e6465 100644 (file)
--- a/drivers/hwmon/ams/ams.h
+++ b/drivers/hwmon/ams/ams.h
@@ -1,5 +1,5 @@
 #include <linux/i2c.h>
-#include <linux/input.h>
+#include <linux/input-polldev.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
@@ -52,8 +52,7 @@ struct ams {
 #endif
 
        /* Joystick emulation */
-       struct task_struct *kthread;
-       struct input_dev *idev;
+       struct input_polled_dev *idev;
        __u16 bustype;
 
        /* calibrated null values */