patch-2.3.16 linux/arch/sparc/kernel/idprom.c

• Lines: 33
• Date: Tue Aug 31 11:23:29 1999
• Orig file: v2.3.15/linux/arch/sparc/kernel/idprom.c
• Orig date: Tue Aug 4 16:03:34 1998

diff -u --recursive --new-file v2.3.15/linux/arch/sparc/kernel/idprom.c linux/arch/sparc/kernel/idprom.c
@@ -1,4 +1,4 @@
-/* $Id: idprom.c,v 1.23 1998/07/28 16:52:44 jj Exp $
+/* $Id: idprom.c,v 1.24 1999/08/31 06:54:20 davem Exp $
  * idprom.c: Routines to load the idprom into kernel addresses and
  *           interpret the data contained within.
  *
@@ -46,7 +46,7 @@
 /* One entry for the OBP arch's which are sun4d, sun4e, and newer sun4m's */
 { "Sun4M OBP based system", (SM_SUN4M_OBP | 0x0) } };
 
-__initfunc(static void display_system_type(unsigned char machtype))
+static void __init display_system_type(unsigned char machtype)
 {
 	char sysname[128];
 	register int i;
@@ -69,7 +69,7 @@
 }
 
 /* Calculate the IDPROM checksum (xor of the data bytes). */
-__initfunc(static unsigned char calc_idprom_cksum(struct idprom *idprom))
+static unsigned char __init calc_idprom_cksum(struct idprom *idprom)
 {
 	unsigned char cksum, i, *ptr = (unsigned char *)idprom;
 
@@ -80,7 +80,7 @@
 }
 
 /* Create a local IDPROM copy, verify integrity, and display information. */
-__initfunc(void idprom_init(void))
+void __init idprom_init(void)
 {
 	prom_get_idprom((char *) &idprom_buffer, sizeof(idprom_buffer));