Merge branch 'omap-pool'

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

diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 9d36bc946ac49afb13dc229c397e9cf6e8de15e8..f357de9681c7308d43af80837f70c2c608a108e7 100644 (file)
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -184,6 +184,7 @@ static inline void __init overo_init_smsc911x(void) { return; }
 #endif
 
 
+
 static struct mtd_partition overo_nand_partitions[] = {
        {
                .name           = "xloader",
@@ -393,10 +394,10 @@ static void __init overo_init(void)
        omap_board_config = overo_config;
        omap_board_config_size = ARRAY_SIZE(overo_config);
        omap_serial_init();
-       twl4030_mmc_init(mmc);
-       overo_flash_init();
        usb_musb_init();
        usb_ehci_init();
+       overo_flash_init();
+       overo_init_smsc911x();
        overo_ads7846_init();
        overo_init_smsc911x();