[linuxsh-cvs] CVS: linux/arch/sh/kernel/timers timer-tmu.c, 1.3, 1.4

[Paul M. <le...@us...>]

Update of /cvsroot/linuxsh/linux/arch/sh/kernel/timers
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19538/arch/sh/kernel/timers

Modified Files:
	timer-tmu.c 
Log Message:
Rename rtc_get_time/rtc_set_time to avoid namespace conflict with RTC subsystem.



Index: timer-tmu.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/timers/timer-tmu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- timer-tmu.c	29 Jan 2006 17:46:24 -0000	1.3
+++ timer-tmu.c	7 Jul 2006 10:45:05 -0000	1.4
@@ -132,17 +132,17 @@
 	ctrl_outl(0xffffffff, TMU0_TCOR);
 	ctrl_outl(0xffffffff, TMU0_TCNT);
 
-	rtc_get_time(&ts2);
+	rtc_sh_get_time(&ts2);
 
 	do {
-		rtc_get_time(&ts1);
+		rtc_sh_get_time(&ts1);
 	} while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
 	/* actually start the timer */
 	ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
 
 	do {
-		rtc_get_time(&ts2);
+		rtc_sh_get_time(&ts2);
 	} while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
 
 	freq = 0xffffffff - ctrl_inl(TMU0_TCNT);