Merge branch '7xx-iosplit-plat' with omap-fixes

[linux-beck.git] / arch / arm / mach-omap2 / board-ldp.c

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 5c825607543eb9c2deb714b459e1df4d472c9bfd..c062238fe88144c1d81c949d0ac28c2a2f3b2cf3 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -16,6 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
 #include <linux/gpio_keys.h>
 #include <linux/workqueue.h>
 #include <linux/err.h>
@@ -41,7 +42,6 @@
 #include <asm/delay.h>
 #include <plat/control.h>
 #include <plat/usb.h>
-#include <plat/keypad.h>
 
 #include "mmc-twl4030.h"