ARM: OMAP: Clean-up MMC device init

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-h2-mmc.c

diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
index ab9ee5820c489f935784fa1148764190ede72fdf..37031e01773c93805e1b3560397ba795aff69701 100644 (file)
--- a/arch/arm/mach-omap1/board-h2-mmc.c
+++ b/arch/arm/mach-omap1/board-h2-mmc.c
@@ -14,6 +14,7 @@
 
 #include <mach/mmc.h>
 #include <mach/gpio.h>
+#include <mach/mmc.h>
 
 #ifdef CONFIG_MMC_OMAP
 static int slot_cover_open;
@@ -83,6 +84,8 @@ static struct omap_mmc_platform_data h2_mmc_data = {
        .init                           = h2_mmc_late_init,
        .cleanup                        = h2_mmc_cleanup,
        .slots[0]       = {
+               .enabled                = 1,
+               .wire4                  = 1,
                .set_power              = h2_mmc_set_power,
                .set_bus_mode           = h2_mmc_set_bus_mode,
                .get_ro                 = NULL,
@@ -95,7 +98,7 @@ static struct omap_mmc_platform_data h2_mmc_data = {
 
 void __init h2_mmc_init(void)
 {
-       omap_set_mmc_info(1, &h2_mmc_data);
+       omap1_init_mmc(&h2_mmc_data);
 }
 
 #else