aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Breeds <tony@bakeyournoodle.com>2008-07-30 23:51:43 -0400
committerPaul Mackerras <paulus@samba.org>2008-08-20 02:34:57 -0400
commitfedcf4c73e1b9c1c594cf12d946ea90b7a47cc08 (patch)
tree5f9547651550e54b636461941384c75eca2d74f1
parente16a9c0990a18ee2f2874363392fdfedcf9ded58 (diff)
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>
-rw-r--r--arch/powerpc/platforms/powermac/time.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index bbbefd64ab59..59eb840d8ce2 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)
93} 93}
94#endif 94#endif
95 95
96#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU) || \
97 defined(CONFIG_PMAC_SMU)
96static unsigned long from_rtc_time(struct rtc_time *tm) 98static unsigned long from_rtc_time(struct rtc_time *tm)
97{ 99{
98 return mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, 100 return mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
99 tm->tm_hour, tm->tm_min, tm->tm_sec); 101 tm->tm_hour, tm->tm_min, tm->tm_sec);
100} 102}
103#endif
101 104
102#ifdef CONFIG_ADB_CUDA 105#ifdef CONFIG_ADB_CUDA
103static unsigned long cuda_get_time(void) 106static unsigned long cuda_get_time(void)