aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2010-08-12 11:54:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-12 12:51:35 -0400
commit3557957616412db3f496d75c6baef836f8f55a67 (patch)
tree647c155fdc4f23486f5da133369413d857fb4e43
parentd4a47ac15487ee855386e414bf51435d83cd1812 (diff)
MN10300: Fix RTC routines
A change to the RTC routines in the MN10300 arch used set_rtc_mms() when it meant set_rtc_mmss(). This results in an error due to a reference of an undefined symbol. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/mn10300/kernel/rtc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
index 815a933aafa8..4eef0e7224f6 100644
--- a/arch/mn10300/kernel/rtc.c
+++ b/arch/mn10300/kernel/rtc.c
@@ -20,9 +20,6 @@
20DEFINE_SPINLOCK(rtc_lock); 20DEFINE_SPINLOCK(rtc_lock);
21EXPORT_SYMBOL(rtc_lock); 21EXPORT_SYMBOL(rtc_lock);
22 22
23/* last time the RTC got updated */
24static long last_rtc_update;
25
26/* time for RTC to update itself in ioclks */ 23/* time for RTC to update itself in ioclks */
27static unsigned long mn10300_rtc_update_period; 24static unsigned long mn10300_rtc_update_period;
28 25
@@ -110,7 +107,7 @@ static int set_rtc_mmss(unsigned long nowtime)
110 107
111int update_persistent_clock(struct timespec now) 108int update_persistent_clock(struct timespec now)
112{ 109{
113 return set_rtc_mms(now.tv_sec); 110 return set_rtc_mmss(now.tv_sec);
114} 111}
115 112
116/* 113/*