Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / spi / tsc2301-core.c

diff --git a/drivers/spi/tsc2301-core.c b/drivers/spi/tsc2301-core.c
index 3980943e27e4ec06d4ef417cacc24a23826647b7..939bc48c2b5e8d38468fdfa9682837e851dae5f0 100644 (file)
--- a/drivers/spi/tsc2301-core.c
+++ b/drivers/spi/tsc2301-core.c
@@ -26,7 +26,7 @@
 #include <linux/spi/tsc2301.h>
 
 #ifdef CONFIG_ARCH_OMAP
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #endif
 
 u16 tsc2301_read_reg(struct tsc2301 *tsc, int reg)