MN10300: Fix RTC routines

dhowells · torvalds · commit 355795761641 · 2010-08-12T09:51:35.000-07:00
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 &lt;dhowells@redhat.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/arch/mn10300/kernel/rtc.c b/arch/mn10300/kernel/rtc.c
@@ -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);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@`
`20`	`20`	`DEFINE_SPINLOCK(rtc_lock);`
`21`	`21`	`EXPORT_SYMBOL(rtc_lock);`
`22`	`22`
`23`		`-/* last time the RTC got updated */`
`24`		`-static long last_rtc_update;`
`25`		`-`
`26`	`23`	`/* time for RTC to update itself in ioclks */`
`27`	`24`	`static unsigned long mn10300_rtc_update_period;`
`28`	`25`
`@@ -110,7 +107,7 @@ static int set_rtc_mmss(unsigned long nowtime)`
`110`	`107`
`111`	`108`	`int 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`	`/*`