diff -urN linux/arch/m68k/sun3/config.c linux-2.3.17-work/arch/m68k/sun3/config.c
--- linux/arch/m68k/sun3/config.c Sat Sep 4 21:06:41 1999
+++ linux-2.3.17-work/arch/m68k/sun3/config.c Wed Sep 8 11:37:46 1999
@@ -57,7 +57,7 @@
volatile char* clock_va;
extern unsigned char* sun3_intreg;
-__initfunc(void sun3_init(void))
+void __init sun3_init(void)
{
unsigned char enable_register;
int i;
@@ -106,7 +106,7 @@
prom_reboot ("vmlinux");
}
-__initfunc(void config_sun3(unsigned long *start_mem_p, unsigned long *end_mem_p))
+void __init config_sun3(unsigned long *start_mem_p, unsigned long *end_mem_p)
{
printk("ARCH: SUN3\n");
idprom_init();
@@ -141,7 +141,7 @@
*start_mem_p = sun_serial_setup(*start_mem_p);
}
-__initfunc(void sun3_sched_init(void (*timer_routine)(int, void *, struct pt_regs *)))
+void __init sun3_sched_init(void (*timer_routine)(int, void *, struct pt_regs *))
{
sun3_disable_interrupts();
intersil_clock->cmd_reg=(INTERSIL_RUN|INTERSIL_INT_DISABLE|INTERSIL_24H_MODE);
diff -urN linux/arch/m68k/sun3/idprom.c linux-2.3.17-work/arch/m68k/sun3/idprom.c
--- linux/arch/m68k/sun3/idprom.c Sat Sep 4 21:06:41 1999
+++ linux-2.3.17-work/arch/m68k/sun3/idprom.c Wed Sep 8 11:38:16 1999
@@ -54,7 +54,7 @@
//{ "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)
{
register int i;
@@ -92,7 +92,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;
@@ -103,7 +103,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));
diff -urN linux/arch/m68k/sun3/prom/init.c linux-2.3.17-work/arch/m68k/sun3/prom/init.c
--- linux/arch/m68k/sun3/prom/init.c Sat Sep 4 21:06:41 1999
+++ linux-2.3.17-work/arch/m68k/sun3/prom/init.c Wed Sep 8 11:38:29 1999
@@ -30,7 +30,7 @@
extern void prom_meminit(void);
extern void prom_ranges_init(void);
-__initfunc(void prom_init(struct linux_romvec *rp))
+void __init prom_init(struct linux_romvec *rp)
{
#if CONFIG_AP1000
extern struct linux_romvec *ap_prom_init(void);
diff -urN linux/arch/m68k/sun3/sbus.c linux-2.3.17-work/arch/m68k/sun3/sbus.c
--- linux/arch/m68k/sun3/sbus.c Sat Sep 4 21:06:41 1999
+++ linux-2.3.17-work/arch/m68k/sun3/sbus.c Wed Sep 8 11:38:43 1999
@@ -12,7 +12,7 @@
#include <linux/types.h>
#include <linux/init.h>
-__initfunc(void sbus_init(void))
+void __init sbus_init(void)
{
}
diff -urN linux/drivers/net/sun3lance.c linux-2.3.17-work/drivers/net/sun3lance.c
--- linux/drivers/net/sun3lance.c Sat Sep 4 21:08:32 1999
+++ linux-2.3.17-work/drivers/net/sun3lance.c Wed Sep 8 11:36:51 1999
@@ -240,7 +240,7 @@
/************************* End of Prototypes **************************/
-__initfunc(int sun3lance_probe( struct net_device *dev ))
+int __init sun3lance_probe( struct net_device *dev )
{
static int found = 0;
@@ -255,7 +255,7 @@
return( ENODEV );
}
-__initfunc(static int lance_probe( struct net_device *dev))
+static int __init lance_probe( struct net_device *dev)
{
unsigned long ioaddr, iopte;
diff -urN linux/include/asm-sh/bugs.h linux-2.3.17-work/include/asm-sh/bugs.h
--- linux/include/asm-sh/bugs.h Wed Sep 1 23:34:01 1999
+++ linux-2.3.17-work/include/asm-sh/bugs.h Wed Sep 8 11:36:29 1999
@@ -14,7 +14,7 @@
#include <asm/processor.h>
-__initfunc(static void check_bugs(void))
+static void __init check_bugs(void)
{
}
#endif /* __ASM_SH_BUGS_H */
