ARM: OMAP: Fix gpio by switching to generic gpio calls

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

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index a3bbb078782a328b41c00f839ff194b4b7fd7e74..5d2933d7a75dcceeb7d8a8367837d698a196ddd8 100644 (file)
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -37,7 +37,6 @@
 #include <mach/mux.h>
 #include <mach/board.h>
 #include <mach/usb-musb.h>
-#include <mach/mmc.h>
 #include <mach/common.h>
 #include <mach/keypad.h>
 #include <mach/gpmc.h>
@@ -215,7 +214,7 @@ static struct platform_device *sdp2430_devices[] __initdata = {
 
 static void ads7846_dev_init(void)
 {
-       if (omap_request_gpio(TS_GPIO) < 0)
+       if (gpio_request(TS_GPIO, "ads7846 irq") < 0)
                printk(KERN_ERR "can't get ads746 pen down GPIO\n");
 
        gpio_direction_input(TS_GPIO);
@@ -417,7 +416,7 @@ static void __init omap_2430sdp_init(void)
        spi_register_board_info(sdp2430_spi_board_info,
                                ARRAY_SIZE(sdp2430_spi_board_info));
        ads7846_dev_init();
-       hsmmc_init(mmc);
+       twl4030_mmc_init(mmc);
 
        /* turn off secondary LCD backlight */
        gpio_direction_output(SECONDARY_LCD_GPIO, 0);