Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index e0191aa3a144c683d0d080ac475f016280965558..adbe21fcd68408c30b712d06aff6daf671afed38 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -23,19 +23,19 @@
 #include <asm/tlb.h>
 
 #include <asm/mach/map.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/omapfb.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/sdrc.h>
-#include <asm/arch/gpmc.h>
+#include <mach/mux.h>
+#include <mach/omapfb.h>
+#include <mach/sram.h>
+#include <mach/sdrc.h>
+#include <mach/gpmc.h>
 
 #include "clock.h"
 
-#include <asm/arch/powerdomain.h>
+#include <mach/powerdomain.h>
 
 #include "powerdomains.h"
 
-#include <asm/arch/clockdomain.h>
+#include <mach/clockdomain.h>
 #include "clockdomains.h"
 
 /*