patch-2.4.0-test9 linux/arch/ppc/kernel/gemini_setup.c

• Lines: 25
• Date: Sun Sep 17 09:48:06 2000
• Orig file: v2.4.0-test8/linux/arch/ppc/kernel/gemini_setup.c
• Orig date: Thu Jul 13 09:42:50 2000

diff -u --recursive --new-file v2.4.0-test8/linux/arch/ppc/kernel/gemini_setup.c linux/arch/ppc/kernel/gemini_setup.c
@@ -15,6 +15,7 @@
 #include <linux/errno.h> 
 #include <linux/reboot.h>
 #include <linux/pci.h>
+#include <linux/time.h>
 #include <linux/kdev_t.h>
 #include <linux/types.h>
 #include <linux/major.h>
@@ -335,7 +336,7 @@
 #define gemini_rtc_write(val,x)  (writeb((val),(GEMINI_RTC+(x))))
 
 /* ensure that the RTC is up and running */
-void __init gemini_time_init(void)
+long __init gemini_time_init(void)
 {
 	unsigned char reg;
 
@@ -346,6 +347,7 @@
 		gemini_rtc_write((reg & ~(M48T35_RTC_STOPPED)), M48T35_RTC_CONTROL);
 		gemini_rtc_write((reg | M48T35_RTC_SET), M48T35_RTC_CONTROL);
 	}
+	return 0;
 }
 
 #undef DEBUG_RTC