use gpio_to_irq (OMAP tree only)

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / tsc2005.c

diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c
index 1e4ed3c25db58ff0c8e2b3fd0ac071d29df8781f..38ac5377badb42ffa037b8f89d5ad0198e4d2880 100644 (file)
--- a/drivers/input/touchscreen/tsc2005.c
+++ b/drivers/input/touchscreen/tsc2005.c
@@ -30,7 +30,7 @@
 #include <linux/spi/spi.h>
 
 #ifdef CONFIG_ARCH_OMAP
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #endif
 
 #include <linux/spi/tsc2005.h>
@@ -540,8 +540,8 @@ static int __devinit tsc2005_ts_init(struct tsc2005 *ts,
                dev_err(&ts->spi->dev, "unable to get DAV GPIO");
                goto err1;
        }
-       omap_set_gpio_direction(dav_gpio, 1);
-       ts->irq = OMAP_GPIO_IRQ(dav_gpio);
+       gpio_direction_input(dav_gpio);
+       ts->irq = gpio_to_irq(dav_gpio);
        dev_dbg(&ts->spi->dev, "TSC2005: DAV IRQ = %d\n", ts->irq);
 #endif
        init_timer(&ts->penup_timer);