4 files changed, 6 insertions, 6 deletions
diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index 6808de799..d998d6ff9 100644
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -31,7 +31,7 @@ extern int hp300_get_irq_list(char *buf);
 extern int hp300_keyb_init(void);
 #else
 /* Dummy function for when there is no keyboard. */
-__initfunc(int hp300_keyb_init(void))
+int __init hp300_keyb_init(void)
 {
 }
 #endif
@@ -60,7 +60,7 @@ static void hp300_get_model(char *model)
   strcpy(model, "HP9000/300");
 }
 
-__initfunc(void config_hp300(void))
+void __init config_hp300(void)
 {
   mach_sched_init      = hp300_sched_init;
   mach_keyb_init       = hp300_keyb_init;
diff --git a/arch/m68k/hp300/hil.c b/arch/m68k/hp300/hil.c
index d7fe1867c..dec40562b 100644
--- a/arch/m68k/hp300/hil.c
+++ b/arch/m68k/hp300/hil.c
@@ -304,7 +304,7 @@ static void hil_do(unsigned char cmd, unsigned char *data, unsigned int len)
  * Initialise HIL. 
  */
 
-__initfunc(int hp300_keyb_init(void))
+int __init hp300_keyb_init(void)
 {
   unsigned char s, c, kbid;
   unsigned int n = 0;
diff --git a/arch/m68k/hp300/ints.c b/arch/m68k/hp300/ints.c
index 02538a475..497400575 100644
--- a/arch/m68k/hp300/ints.c
+++ b/arch/m68k/hp300/ints.c
@@ -15,13 +15,13 @@
 #include <linux/sched.h>
 #include <linux/kernel_stat.h>
 #include <linux/interrupt.h>
+#include <linux/spinlock.h>
 #include <asm/machdep.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/ptrace.h>
-#include <asm/spinlock.h>
 #include "ints.h"
 
 /* Each ipl has a linked list of interrupt service routines.
@@ -153,7 +153,7 @@ int hp300_get_irq_list(char *buf)
 	return 0;
 }
 
-__initfunc(void hp300_init_IRQ(void))
+void __init hp300_init_IRQ(void)
 {
 	spin_lock_init(&irqlist_lock);
 }
diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c
index d29c3c5f4..d1aee933f 100644
--- a/arch/m68k/hp300/time.c
+++ b/arch/m68k/hp300/time.c
@@ -61,7 +61,7 @@ unsigned long hp300_gettimeoffset(void)
   return (USECS_PER_JIFFY * ticks) / INTVAL;
 }
 
-__initfunc(void hp300_sched_init(void (*vector)(int, void *, struct pt_regs *)))
+void __init hp300_sched_init(void (*vector)(int, void *, struct pt_regs *))
 {
   writeb(0x1, CLOCKBASE + CLKCR2);		/* select CR1 */
   writeb(0x1, CLOCKBASE + CLKCR1);		/* reset */