Merge branch 'hsmmc-init' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

1 files changed, 0 insertions, 11 deletions

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 9ba097868e72..3b34c20d1df4 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -41,19 +41,8 @@ static struct omap_uart_config generic_uart_config __initdata = {
         .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
 
-static struct omap_mmc_config generic_mmc_config __initdata = {
-        .mmc [0] = {
-                .enabled        = 0,
-                .wire4          = 0,
-                .wp_pin         = -1,
-                .power_pin      = -1,
-                .switch_pin     = -1,
-        },
-};
-
 static struct omap_board_config_kernel generic_config[] = {
         { OMAP_TAG_UART,        &generic_uart_config },
-        { OMAP_TAG_MMC,         &generic_mmc_config },
 };
 
 static void __init omap_generic_init(void)