ARM: OMAP: Clean-up MMC device init

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

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 54ecab9ed5a8e62f551eace3baa7cea495359503..c65358b2c2ba61d989f54f73c42c630286497bea 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -391,19 +391,6 @@ static struct omap_uart_config h4_uart_config __initdata = {
 #endif
 };
 
-static struct omap_mmc_config h4_mmc_config __initdata = {
-       .mmc [0] = {
-               .enabled        = 1,
-               .wire4          = 1,
-       },
-       .mmc [1] = {
-               .enabled        = 1,
-               .wire4          = 1,
-       },
-};
-
-extern struct omap_mmc_platform_data h4_mmc_data;
-
 static struct omap_lcd_config h4_lcd_config __initdata = {
        .ctrl_name      = "internal",
 };
@@ -470,7 +457,6 @@ static struct spi_board_info h4_spi_board_info[] __initdata = {
 
 static struct omap_board_config_kernel h4_config[] __initdata = {
        { OMAP_TAG_UART,        &h4_uart_config },
-       { OMAP_TAG_MMC,         &h4_mmc_config },
        { OMAP_TAG_LCD,         &h4_lcd_config },
        { OMAP_TAG_USB,         &h4_usb_config },
 };
@@ -664,13 +650,6 @@ static struct i2c_board_info __initdata h4_i2c_board_info[] = {
 #endif
 };
 
-static struct i2c_board_info __initdata h4_i2c_board_info[] = {
-       {
-               I2C_BOARD_INFO("isp1301_omap", 0x2d),
-               .irq            = OMAP_GPIO_IRQ(125),
-       },
-};
-
 static void __init omap_h4_init(void)
 {
        /*