Merge ARM fixes

1 files changed, 17 insertions, 0 deletions

diff --git a/include/asm-arm/hardware/gpio_keys.h b/include/asm-arm/hardware/gpio_keys.h
new file mode 100644
index 000000000000..2b217c7b9312
--- /dev/null
+++ b/include/asm-arm/hardware/gpio_keys.h
@@ -0,0 +1,17 @@
+#ifndef _GPIO_KEYS_H
+#define _GPIO_KEYS_H
+
+struct gpio_keys_button {
+        /* Configuration parameters */
+        int keycode;
+        int gpio;
+        int active_low;
+        char *desc;
+};
+
+struct gpio_keys_platform_data {
+        struct gpio_keys_button *buttons;
+        int nbuttons;
+};
+
+#endif