diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-20 13:10:09 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 13:10:09 +0200 |
| commit | 17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (patch) | |
| tree | 1c2a7dbbbce95db33bbfd2725fa19f2d2ecf6ecd /arch/ppc64/kernel/maple_time.c | |
| parent | ppc64: Use the merged mpic.c (diff) | |
| download | linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.tar.xz linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.zip | |
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>
Diffstat (limited to 'arch/ppc64/kernel/maple_time.c')
| -rw-r--r-- | arch/ppc64/kernel/maple_time.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |