[linuxsh-cvs] CVS: linux/arch/sh/kernel time.c,1.39,1.40

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

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

Modified Files:
	time.c 
Log Message:
rtc_sh_get_time() unconditionally in time_init().



Index: time.c
===================================================================
RCS file: /cvsroot/linuxsh/linux/arch/sh/kernel/time.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- time.c	3 Aug 2006 06:55:14 -0000	1.39
+++ time.c	3 Aug 2006 07:42:41 -0000	1.40
@@ -184,7 +184,6 @@
 	sys_timer->dev.cls = &timer_sysclass;
 	return sysdev_register(&sys_timer->dev);
 }
-
 device_initcall(timer_init_sysfs);
 
 void (*board_time_init)(void);
@@ -196,15 +195,9 @@
 
 	clk_init();
 
-	if (rtc_sh_get_time) {
-		rtc_sh_get_time(&xtime);
-	} else {
-		xtime.tv_sec = mktime(2000, 1, 1, 0, 0, 0);
-		xtime.tv_nsec = 0;
-	}
-
-        set_normalized_timespec(&wall_to_monotonic,
-                                -xtime.tv_sec, -xtime.tv_nsec);
+	rtc_sh_get_time(&xtime);
+	set_normalized_timespec(&wall_to_monotonic,
+				-xtime.tv_sec, -xtime.tv_nsec);
 
 	/*
 	 * Find the timer to use as the system timer, it will be