ARM: OMAP: Get rid of controller vs slot confusion, initialize MMC devices dynamicall...

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

diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index 57be5298f539e103981b0c2f4023a1c77bfa4357..069ca8d48aa33cb4bc8e8fb37716a84fa292aa1f 100644 (file)
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -34,7 +34,6 @@
 #include <mach/mux.h>
 #include <mach/tc.h>
 #include <mach/usb.h>
-#include <mach/mmc.h>
 
 static struct plat_serial8250_port voiceblue_ports[] = {
        {
@@ -141,16 +140,6 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
        .pins[2]        = 6,
 };
 
-static struct omap_mmc_platform_data voiceblue_mmc_data = {
-       .nr_slots                       = 1,
-       .slots[0]       = {
-               .enabled                = 1,
-               .power_pin              = 2,
-               .switch_pin             = -1,
-               .name                   = "mmcblk",
-       },
-};
-
 static struct omap_uart_config voiceblue_uart_config __initdata = {
        .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
@@ -204,8 +193,6 @@ static void __init voiceblue_init(void)
         * (it is connected through invertor) */
        omap_writeb(0x00, OMAP_LPG1_LCR);
        omap_writeb(0x00, OMAP_LPG1_PMR);       /* Disable clock */
-
-       omap1_init_mmc(&voiceblue_mmc_data);
 }
 
 static void __init voiceblue_map_io(void)