aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/platforms/powermac
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-14 21:56:57 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-15 11:17:09 +1100
commitba76cd575ffd461d83507c23cf53c78d56d1ea0a (patch)
tree256053e3982f8e0e5c541fa887faccad2bb0a9ed /arch/powerpc/platforms/powermac
parenta272e24cc8751d125f9582befed0213a2a2b270f (diff)
powerpc: Remove __init from a function used in suspend/resume.
Suspend/resume on powermacs uses the pmac_get_boot_time function, so it can't be marked as __init. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac')
-rw-r--r--arch/powerpc/platforms/powermac/time.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index b1714f9bd92..feb0a94e781 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -199,7 +199,8 @@ static unsigned long smu_get_time(void)
#define smu_set_rtc_time(tm, spin) 0
#endif
-unsigned long __init pmac_get_boot_time(void)
+/* Can't be __init, it's called when suspending and resuming */
+unsigned long pmac_get_boot_time(void)
{
/* Get the time from the RTC, used only at boot time */
switch (sys_ctrler) {