1 files changed, 5 insertions, 14 deletions

diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index adfcd7b51393..5157eea9be35 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -447,15 +447,6 @@ static struct omap_usb_config h3_usb_config __initdata = {
         .pins[1]        = 3,
 };
 
-static struct omap_mmc_config h3_mmc_config __initdata = {
-        .mmc[0] = {
-                .enabled        = 1,
-                .wire4          = 1,
-       },
-};
-
-extern struct omap_mmc_platform_data h3_mmc_data;
-
 static struct omap_uart_config h3_uart_config __initdata = {
         .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)),
 };
@@ -466,7 +457,6 @@ static struct omap_lcd_config h3_lcd_config __initdata = {
 
 static struct omap_board_config_kernel h3_config[] __initdata = {
         { OMAP_TAG_USB,         &h3_usb_config },
-        { OMAP_TAG_MMC,         &h3_mmc_config },
         { OMAP_TAG_UART,        &h3_uart_config },
         { OMAP_TAG_LCD,         &h3_lcd_config },
 };
@@ -498,7 +488,7 @@ static struct omap_gpio_switch h3_gpio_switches[] __initdata = {
 
 static int nand_dev_ready(struct omap_nand_platform_data *data)
 {
-        return omap_get_gpio_datain(H3_NAND_RB_GPIO_PIN);
+        return gpio_get_value(H3_NAND_RB_GPIO_PIN);
 }
 
 static void __init h3_init(void)
@@ -516,8 +506,9 @@ static void __init h3_init(void)
 
         nand_resource.end = nand_resource.start = OMAP_CS2B_PHYS;
         nand_resource.end += SZ_4K - 1;
-        if (!(omap_request_gpio(H3_NAND_RB_GPIO_PIN)))
-                nand_data.dev_ready = nand_dev_ready;
+        if (gpio_request(H3_NAND_RB_GPIO_PIN, "NAND ready") < 0)
+                BUG();
+        nand_data.dev_ready = nand_dev_ready;
 
         /* GPIO10 Func_MUX_CTRL reg bit 29:27, Configure V2 to mode1 as GPIO */
         /* GPIO10 pullup/down register, Enable pullup on GPIO10 */
@@ -537,7 +528,7 @@ static void __init h3_init(void)
 static void __init h3_init_smc91x(void)
 {
         omap_cfg_reg(W15_1710_GPIO40);
-        if (omap_request_gpio(40) < 0) {
+        if (gpio_request(40, "SMC91x irq") < 0) {
                 printk("Error requesting gpio 40 for smc91x irq\n");
                 return;
         }