Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 524b4db06dca699bd774606b369fed592808f41c..4652136de15f7150b61496d0bd190bb0e785cd1b 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -24,11 +24,11 @@
 #include <linux/suspend.h>
 #include <linux/time.h>
 
-#include <asm/arch/cpu.h>
+#include <mach/cpu.h>
 #include <asm/mach/time.h>
 #include <asm/atomic.h>
 
-#include <asm/arch/pm.h>
+#include <mach/pm.h>
 #include "pm.h"
 
 unsigned short enable_dyn_sleep;