Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / include / linux / gpio_keys.h

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
index 3204edfe6b1955f232384c10716d1e0142c7d1ee..b5ca4b2c08ecad2fad00c33d48b62466737966b0 100644 (file)
--- a/include/linux/gpio_keys.h
+++ b/include/linux/gpio_keys.h
@@ -22,6 +22,7 @@ struct gpio_keys_platform_data {
        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