USB: Clean-up USB init code for next merge window

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-omap3evm.c

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 8a1b86ef45575299075f3a1592f088ea59f1670d..657772677a347c756569e652891ca46d2d3f4086 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -30,11 +30,8 @@
 #include <asm/mach/map.h>
 
 #include <mach/gpio.h>
-#include <mach/keypad.h>
 #include <mach/board.h>
-#include <mach/mmc.h>
-#include <mach/usb-musb.h>
-#include <mach/usb-ehci.h>
+#include <mach/usb.h>
 #include <mach/common.h>
 #include <mach/mcspi.h>
 
@@ -256,7 +253,7 @@ static void __init omap3_evm_init(void)
                                ARRAY_SIZE(omap3evm_spi_board_info));
 
        omap_serial_init();
-       hsmmc_init(mmc);
+       twl4030_mmc_init(mmc);
        usb_musb_init();
        usb_ehci_init();
        omap3evm_flash_init();