Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

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

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index c6d3a9d..cd0b3f3 100644 (file)
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -9,11 +9,14 @@ struct gpio_keys_button {
        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 */
+       bool can_disable;
 };
 
 struct gpio_keys_platform_data {
        struct gpio_keys_button *buttons;
        int nbuttons;
+       unsigned int rep:1;             /* enable input subsystem auto repeat */
 };
 
 #endif