Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=49015bee4071d56456ef59f1f82be6531615341c
Commit:     49015bee4071d56456ef59f1f82be6531615341c
Parent:     0a938b9768d1fc0e12a884a6820a2e15df5a612c
Author:     David Brownell <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 5 00:30:22 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Mar 5 07:57:51 2007 -0800

    [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]>
---
 drivers/input/keyboard/gpio_keys.c   |    4 +---
 include/asm-arm/hardware/gpio_keys.h |   17 -----------------
 include/linux/gpio_keys.h            |   17 +++++++++++++++++
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/drivers/input/keyboard/gpio_keys.c 
b/drivers/input/keyboard/gpio_keys.c
index fa03a00..ccf6df3 100644
--- 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
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
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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to