]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
MN10300: Fix RTC routines
authorDavid Howells <dhowells@redhat.com>
Thu, 12 Aug 2010 15:54:36 +0000 (16:54 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 16:51:35 +0000 (09:51 -0700)
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>
arch/mn10300/kernel/rtc.c

index 815a933aafa8c4a7ec400d8de316cdf367ad5edf..4eef0e7224f63728feb8f99216cbad2b5be9999f 100644 (file)
@@ -20,9 +20,6 @@
 DEFINE_SPINLOCK(rtc_lock);
 EXPORT_SYMBOL(rtc_lock);
 
-/* last time the RTC got updated */
-static long last_rtc_update;
-
 /* time for RTC to update itself in ioclks */
 static unsigned long mn10300_rtc_update_period;
 
@@ -110,7 +107,7 @@ static int set_rtc_mmss(unsigned long nowtime)
 
 int update_persistent_clock(struct timespec now)
 {
-       return set_rtc_mms(now.tv_sec);
+       return set_rtc_mmss(now.tv_sec);
 }
 
 /*