Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / omap-keypad.c

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 90c092f20302664d84a17111b20ad741657939a2..38b1a79b4a5f7866ed511797d0dd1701dbda5927 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -36,13 +36,13 @@
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/i2c/menelaus.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/keypad.h>
+#include <mach/gpio.h>
+#include <mach/keypad.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 
 #undef NEW_BOARD_LEARNING_MODE