X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Farm%2Fmach-omap2%2Fpm.c;h=4652136de15f7150b61496d0bd190bb0e785cd1b;hb=fdee8764947cde1e6933e7d981ce5b9de00e83e6;hp=b7434dfc680e490394207a7f6c23d28dbed4941d;hpb=7786cd7a00ae0b18923185789380a88052f4eee7;p=linux-2.6-omap-h63xx.git

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index b7434dfc680..4652136de15 100644
--- 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;