powerpc/ppc/ppc64: Various compile fixes.

This declares powersave_nap in system.h and makes it an int everywhere,
fixes typos for the maple platform, fixes a couple of places where
I missed removing the last two arguments from a message_pass function,
and makes ppc64 consistent with ppc32 in the type of the
pci_bridge.cfg_data field.

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 0a12fbef7347..11e5b44713f7 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -75,7 +75,7 @@ void cpu_idle(void)
 /*
  * Register the sysctl to set/clear powersave_nap.
  */
-extern unsigned long powersave_nap;
+extern int powersave_nap;
 
 static ctl_table powersave_nap_ctl_table[]={
         {
diff --git a/arch/ppc64/kernel/maple_time.c b/arch/ppc64/kernel/maple_time.c
index cf5186335900..445cb7470bf5 100644
--- a/arch/ppc64/kernel/maple_time.c
+++ b/arch/ppc64/kernel/maple_time.c
@@ -172,7 +172,7 @@ unsigned long __init maple_get_boot_time(void)
         }
         
         maple_get_rtc_time(&tm);
-        return mktime(time->tm_year+1900, time->tm_mon+1, time->tm_mday,
-                      time->tm_hour, time->tm_min, time->tm_sec);
+        return mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday,
+                      tm.tm_hour, tm.tm_min, tm.tm_sec);
 }