[PATCH] gpio_keys driver shouldn't be ARM-specific

The gpio_keys driver is wrongly ARM-specific; it can't build on
other platforms with GPIO suport.  This fixes that problem.

Signed-off-by: David Brownell <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: pHilipp Zabel <[email protected]>
Cc: Haavard Skinnemoen <[email protected]>
Cc: Russell King <[email protected]>
Cc: Richard Purdie <[email protected]>
Cc: Ben Nizette <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index fa03a00b4c6df8948e8d6eba0033cf58bf360ba8..ccf6df387b62d88e64790c3622202d0b296c21e3 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -23,11 +23,9 @@
 #include <linux/platform_device.h>
 #include <linux/input.h>
 #include <linux/irq.h>
+#include <linux/gpio_keys.h>
 
 #include <asm/gpio.h>
-#include <asm/arch/hardware.h>
-
-#include <asm/hardware/gpio_keys.h>
 
 static irqreturn_t gpio_keys_isr(int irq, void *dev_id)
 {

diff --git a/include/asm-arm/hardware/gpio_keys.h b/include/asm-arm/hardware/gpio_keys.h
deleted file mode 100644 (file)
index 2b217c7..0000000
--- a/include/asm-arm/hardware/gpio_keys.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#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

diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
new file mode 100644 (file)
index 0000000..2b217c7
--- /dev/null
+++ b/include/linux/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