aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-14 05:56:57 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-14 19:17:09 -0500
commitba76cd575ffd461d83507c23cf53c78d56d1ea0a (patch)
tree256053e3982f8e0e5c541fa887faccad2bb0a9ed /arch/powerpc
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')
-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 b1714f9bd920..feb0a94e7819 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)
199#define smu_set_rtc_time(tm, spin) 0 199#define smu_set_rtc_time(tm, spin) 0
200#endif 200#endif
201 201
202unsigned long __init pmac_get_boot_time(void) 202/* Can't be __init, it's called when suspending and resuming */
203unsigned long pmac_get_boot_time(void)
203{ 204{
204 /* Get the time from the RTC, used only at boot time */ 205 /* Get the time from the RTC, used only at boot time */
205 switch (sys_ctrler) { 206 switch (sys_ctrler) {