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

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

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 607845b7207f28fda819fae7f7bcd7e003fc1e13..a2abac98c56927c6f776b35993ba1325af13f5a9 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -17,6 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/i2c/twl4030.h>
@@ -38,7 +39,6 @@
 #include <plat/gpmc.h>
 
 #include <plat/control.h>
-#include <plat/keypad.h>
 #include <plat/gpmc-smc91x.h>
 
 #include "sdram-qimonda-hyb18m512160af-6.h"