Merge branch 'omap-all' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / gpio.h

diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
index 5bb7460cabc40a2a1b51cbd5638a7465fc2a38ad..98e9008b7e9d172ad06eb50a000cca0ef5443bb0 100644 (file)
--- a/arch/arm/plat-omap/include/mach/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -26,8 +26,8 @@
 #ifndef __ASM_ARCH_OMAP_GPIO_H
 #define __ASM_ARCH_OMAP_GPIO_H
 
+#include <linux/io.h>
 #include <mach/irqs.h>
-#include <asm/io.h>
 
 #define OMAP_MPUIO_BASE                        0xfffb5000