---

yaml --- r: 14176 b: refs/heads/master c: ba76cd5 h: refs/heads/master v: v3
git-mirror · Nov 15, 2005 · 990152a · 990152a
1 parent 157a071
commit 990152a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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) {