Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / gpmc.c

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 11f19ff7225beb4525ef2ff2ef4e476547785f97..9d6c916ae3ea66997b4600632ff2a938004f5eef 100644 (file)
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -21,9 +21,9 @@
 #include <linux/io.h>
 
 #include <asm/mach-types.h>
-#include <asm/arch/gpmc.h>
+#include <mach/gpmc.h>
 
-#include <asm/arch/sdrc.h>
+#include <mach/sdrc.h>
 
 /* GPMC register offsets */
 #define GPMC_REVISION          0x00