Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
similarity index 98%
rename from include/asm-arm/arch-omap/gpio.h
rename to arch/arm/plat-omap/include/mach/gpio.h
index c49d38ace0de807d0d844a81e96edfdd5d97b5fd..416fdf3549de94d858d62cd48a429df94d543251 100644 (file)
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/gpio.h
+ * arch/arm/plat-omap/include/mach/gpio.h
  *
  * OMAP GPIO handling defines and functions
  *
@@ -26,7 +26,7 @@
 #ifndef __ASM_ARCH_OMAP_GPIO_H
 #define __ASM_ARCH_OMAP_GPIO_H
 
-#include <asm/arch/irqs.h>
+#include <mach/irqs.h>
 #include <asm/io.h>
 
 #define OMAP_MPUIO_BASE                        (void __iomem *)0xfffb5000