Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 7 insertions, 3 deletions

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index ce73a30113b4..b5ca4b2c08ec 100644
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -3,22 +3,26 @@
 
 struct gpio_keys_button {
         /* Configuration parameters */
-        int code;               /* input event code (KEY_*, SW_*) */
+        unsigned int code;      /* input event code (KEY_*, SW_*) */
         int gpio;
         int active_low;
-        char *desc;
-        int type;               /* input event type (EV_KEY, EV_SW) */
+        const char *desc;
+        unsigned int type;      /* input event type (EV_KEY, EV_SW, EV_ABS) */
         int wakeup;             /* configure the button as a wake-up source */
         int debounce_interval;  /* debounce ticks interval in msecs */
         bool can_disable;
+        int value;              /* axis value for EV_ABS */
 };
 
 struct gpio_keys_platform_data {
         struct gpio_keys_button *buttons;
         int nbuttons;
+        unsigned int poll_interval;     /* polling interval in msecs -
+                                           for polling driver only */
         unsigned int rep:1;             /* enable input subsystem auto repeat */
         int (*enable)(struct device *dev);
         void (*disable)(struct device *dev);
+        const char *name;               /* input device name */
 };
 
 #endif