Merge current mainline tree into linux-omap tree

[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..7fb107ec69ef305bbba86465bc27d106826ed1e4 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>