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

• Lines: 60
• Date: Tue Aug 31 11:36:43 1999
• Orig file: v2.3.15/linux/arch/ppc/kernel/mbx_setup.c
• Orig date: Mon Jun 28 13:40:39 1999

diff -u --recursive --new-file v2.3.15/linux/arch/ppc/kernel/mbx_setup.c linux/arch/ppc/kernel/mbx_setup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: mbx_setup.c,v 1.11 1999/06/28 17:59:43 cort Exp $
+ * $Id: mbx_setup.c,v 1.12 1999/08/31 06:53:56 davem Exp $
  *
  *  linux/arch/ppc/kernel/setup.c
  *
@@ -75,8 +75,8 @@
 {
 }
 
-__initfunc(void
-mbx_setup_arch(unsigned long * memory_start_p, unsigned long * memory_end_p))
+void __init
+mbx_setup_arch(unsigned long * memory_start_p, unsigned long * memory_end_p)
 {
 	int	cpm_page;
 	extern char cmd_line[];
@@ -141,7 +141,7 @@
  * sixteen, or external oscillator divided by four.  Currently, we only
  * support the MBX, which is system clock divided by sixteen.
  */
-__initfunc(void mbx_calibrate_decr(void))
+void __init mbx_calibrate_decr(void)
 {
 	bd_t	*binfo = (bd_t *)&res;
 	int freq, fp, divisor;
@@ -182,8 +182,7 @@
 	return(0);
 }
 
-initfunc(unsigned long
-mbx_get_rtc_time(void)
+unsigned long __init mbx_get_rtc_time(void)
 {
 	/* First, unlock all of the registers we are going to modify.
 	 * To protect them from corruption during power down, registers
@@ -310,8 +309,8 @@
  * interrupts can be either edge or level triggered, but there is no
  * reason for us to change the EPPC-bug values (it would not work if we did).
  */
-__initfunc(void
-mbx_init_IRQ(void))
+void __init
+mbx_init_IRQ(void)
 {
 	int i;
 
@@ -413,9 +412,9 @@
 }
 #endif
 
-__initfunc(void
+void __init
 mbx_init(unsigned long r3, unsigned long r4, unsigned long r5,
-	 unsigned long r6, unsigned long r7))
+	 unsigned long r6, unsigned long r7)
 {
 
 	if ( r3 )