[Linux-mips-commits]CVS: linux/arch/mips/cobalt setup.c,1.8,1.9

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/cobalt
In directory usw-pr-cvs1:/tmp/cvs-serv9771

Modified Files:
	setup.c 
Log Message:
While testing the new time code it makes it handy if I can go back and forth between both old time and new time styles.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/cobalt/setup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- setup.c	2001/10/26 16:55:56	1.8
+++ setup.c	2001/10/26 17:49:18	1.9
@@ -118,6 +118,8 @@
 	*((volatile unsigned long *) GALILEO_CPU_MASK) = (unsigned long) 0x00000100;
 }
 
+#ifdef CONFIG_NEW_TIME_C 
+
 static void __init cobalt_time_init(void)
 {
 	//mips_counter_frequency = 83000000;
@@ -131,6 +133,7 @@
 	 */
 	/* rtc_set_time(mktime(2001, 10, 05, 17, 20, 0)); */
 }
+#endif
 
 int cobalt_serial_present;
 int cobalt_serial_type;
@@ -151,8 +154,12 @@
 	_machine_halt = cobalt_machine_halt;
 	_machine_power_off = cobalt_machine_power_off;
 
+#ifdef CONFIG_NEW_TIME_C
 	board_time_init = cobalt_time_init;
 	board_timer_setup = cobalt_timer_setup;       
+#else
+	board_time_init = cobalt_timer_setup;
+#endif
 
 	rtc_ops = &cobalt_rtc_ops;
 #ifdef CONFIG_BLK_DEV_IDE