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/mips/dec/promcon.c | |
parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/dec/promcon.c')
-rw-r--r-- | arch/mips/dec/promcon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/dec/promcon.c b/arch/mips/dec/promcon.c index 8399e5db1..de9eaf5b2 100644 --- a/arch/mips/dec/promcon.c +++ b/arch/mips/dec/promcon.c @@ -35,7 +35,7 @@ static int prom_console_wait_key(struct console *co) return prom_getchar(); } -__initfunc(static int prom_console_setup(struct console *co, char *options)) +static int __init prom_console_setup(struct console *co, char *options) { return 0; } @@ -64,7 +64,7 @@ static struct console sercons = * Register console. */ -__initfunc(long prom_console_init(long kmem_start, long kmem_end)) +long __init prom_console_init(long kmem_start, long kmem_end) { register_console(&sercons); return kmem_start; |