Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index ebc7eb3a7f5c861a1ecd5f1c14247304a0dbad7c..125b75affebbdf05525ef06c0ff7b18330d1648d 100644 (file)
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -26,9 +26,9 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/arch/io.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/control.h>
+#include <mach/io.h>
+#include <mach/pm.h>
+#include <mach/control.h>
 
 #include "prm.h"
 #include "sdrc.h"