Misc clean-up for upstream merges

[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 e2eed499fc28883c7264b39f306ec2d0ce9b4ec7..ade186bd9c4c9add75bf4e6d113510bc7060896b 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -35,7 +35,6 @@
 #include <mach/board.h>
 #include <mach/usb-musb.h>
 #include <mach/usb-ehci.h>
-#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/keypad.h>
 #include <mach/dma.h>
@@ -481,7 +480,7 @@ static void __init omap_3430sdp_init(void)
        omap_serial_init();
        usb_musb_init();
        usb_ehci_init();
-       hsmmc_init(mmc);
+       twl4030_mmc_init(mmc);
 }
 
 static void __init omap_3430sdp_map_io(void)