use standard gpio get/set calls (OMAP tree only)

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

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index f2dea78c16c998fcaaf860a494a1a85439771704..eb53d56f0b96956a943ae346e53976189f9c7892 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -179,7 +179,7 @@ static void ads7846_dev_init(void)
 
 static int ads7846_get_pendown_state(void)
 {
-       return !omap_get_gpio_datain(ts_gpio);
+       return !gpio_get_value(ts_gpio);
 }
 
 /*
@@ -450,11 +450,13 @@ static struct twl4030_hsmmc_info mmc[] __initdata = {
                .mmc            = 1,
                .wires          = 8,
                .gpio_cd        = -EINVAL,
+               .gpio_wp        = -EINVAL,
        },
        {
                .mmc            = 2,
                .wires          = 8,
                .gpio_cd        = -EINVAL,
+               .gpio_wp        = -EINVAL,
        },
        {}      /* Terminator */
 };