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 b7434dfc680e490394207a7f6c23d28dbed4941d..4652136de15f7150b61496d0bd190bb0e785cd1b 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -24,10 +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 <mach/pm.h>
 #include "pm.h"
 
 unsigned short enable_dyn_sleep;
@@ -89,7 +90,7 @@ void omap2_allow_sleep(void)
        BUG_ON(i < 0);
 }
 
-int __init omap_pm_init(void)
+static int __init omap_pm_init(void)
 {
        int error = -1;