Revert "Separate out 3430 LCD panel support from 2430 file"

[linux-2.6-omap-h63xx.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 f3a316ff04afab9ce2c75de4be2ae59f621d2ab6..f6cd08b05bacedfc5417177a2b42b9222073f1d1 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -20,6 +20,7 @@
 #include <linux/workqueue.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/i2c/twl4030.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
@@ -28,11 +29,13 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <asm/arch/twl4030.h>
 #include <asm/arch/mcspi.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/board.h>
+#include <asm/arch/usb-musb.h>
+#include <asm/arch/usb-ehci.h>
+#include <asm/arch/hsmmc.h>
 #include <asm/arch/common.h>
 #include <asm/arch/keypad.h>
 #include <asm/arch/dma.h>
@@ -297,8 +300,9 @@ static void __init omap_3430sdp_init(void)
        ads7846_dev_init();
        sdp3430_flash_init();
        omap_serial_init();
-       sdp3430_usb_init();
-       sdp_mmc_init();
+       usb_musb_init();
+       usb_ehci_init();
+       hsmmc_init();
 }
 
 static void __init omap_3430sdp_map_io(void)