From 990152abe00dc8227c9f481661b12b3d581fcec0 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Mon, 14 Nov 2005 21:56:57 +1100
Subject: [PATCH] --- yaml --- r: 14176 b: refs/heads/master c:
 ba76cd575ffd461d83507c23cf53c78d56d1ea0a h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/powermac/time.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 13412e1a33e6..401abd495b1d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a272e24cc8751d125f9582befed0213a2a2b270f
+refs/heads/master: ba76cd575ffd461d83507c23cf53c78d56d1ea0a
diff --git a/trunk/arch/powerpc/platforms/powermac/time.c b/trunk/arch/powerpc/platforms/powermac/time.c
index b1714f9bd920..feb0a94e7819 100644
--- a/trunk/arch/powerpc/platforms/powermac/time.c
+++ b/trunk/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) {