From: Tony Breeds <tony@bakeyournoodle.com>
Date: Thu, 31 Jul 2008 03:51:43 +0000 (+1000)
Subject: powerpc: Guard from_rtc_time() in platforms/powermac/time.c
X-Git-Tag: v2.6.28-rc1~569^2~92
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fedcf4c73e1b9c1c594cf12d946ea90b7a47cc08;p=~emulex%2Finfiniband.git

powerpc: Guard from_rtc_time() in platforms/powermac/time.c

from_rtc_time() is only called when one of 3 CONFIG options are defined.
Guard the declaration appropriately.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index bbbefd64ab5..59eb840d8ce 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -93,11 +93,14 @@ static void to_rtc_time(unsigned long now, struct rtc_time *tm)
 }
 #endif
 
+#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU) || \
+    defined(CONFIG_PMAC_SMU)
 static unsigned long from_rtc_time(struct rtc_time *tm)
 {
 	return mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
 		      tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
+#endif
 
 #ifdef CONFIG_ADB_CUDA
 static unsigned long cuda_get_time(void)