Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / include / linux / gpio_keys.h

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index 2b217c7b931252b962402442244dc00b212041ea..ec6ecd74781dca68bdf49c3ea1b80cc00b9d4966 100644 (file)
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -3,10 +3,13 @@
 
 struct gpio_keys_button {
        /* Configuration parameters */
-       int keycode;
+       int code;               /* input event code (KEY_*, SW_*) */
        int gpio;
        int active_low;
        char *desc;
+       int type;               /* input event type (EV_KEY, EV_SW) */
+       int wakeup;             /* configure the button as a wake-up source */
+       int debounce_interval;  /* debounce ticks interval in msecs */
 };
 
 struct gpio_keys_platform_data {