diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /arch/m68k/hp300/config.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/m68k/hp300/config.c')
| -rw-r--r-- | arch/m68k/hp300/config.c | 4 |
1 files changed, 2 insertions, 2 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; |