patch-2.3.16 linux/arch/ppc/kernel/pmac_time.c

• Lines: 27
• Date: Tue Aug 31 11:36:43 1999
• Orig file: v2.3.15/linux/arch/ppc/kernel/pmac_time.c
• Orig date: Tue Aug 4 23:57:51 1998

diff -u --recursive --new-file v2.3.15/linux/arch/ppc/kernel/pmac_time.c linux/arch/ppc/kernel/pmac_time.c
@@ -15,6 +15,8 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/init.h>
+
+#include <asm/init.h>
 #include <asm/adb.h>
 #include <asm/cuda.h>
 #include <asm/pmu.h>
@@ -91,7 +93,7 @@
  * Calibrate the decrementer register using VIA timer 1.
  * This is used both on powermacs and CHRP machines.
  */
-__initfunc(int via_calibrate_decr(void))
+int __init via_calibrate_decr(void)
 {
 	struct device_node *vias;
 	volatile unsigned char *via;
@@ -168,7 +170,7 @@
  * This was taken from the pmac time_init() when merging the prep/pmac
  * time functions.
  */
-__initfunc(void pmac_calibrate_decr(void))
+void __init pmac_calibrate_decr(void)
 {
 	struct device_node *cpu;
 	int freq, *fp, divisor;