Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / sleep242x.S

diff --git a/arch/arm/mach-omap2/sleep242x.S b/arch/arm/mach-omap2/sleep242x.S
index 33bdd019f3385866198046591bca4aaf3f588535..5e38ab7822bc72ac5bfb764ed9f98dec83a5b92f 100644 (file)
--- a/arch/arm/mach-omap2/sleep242x.S
+++ b/arch/arm/mach-omap2/sleep242x.S
@@ -27,10 +27,10 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/pm.h>
+#include <mach/io.h>
+#include <mach/pm.h>
 
-#include <asm/arch/omap24xx.h>
+#include <mach/omap24xx.h>
 
 #include "sdrc.h"