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/serial.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/dec/serial.c')
| -rw-r--r-- | arch/mips/dec/serial.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/dec/serial.c b/arch/mips/dec/serial.c index fcf324199..6cb764d02 100644 --- a/arch/mips/dec/serial.c +++ b/arch/mips/dec/serial.c @@ -16,7 +16,8 @@ * console device I strongly recommend to use only one. */ -#include <asm/init.h> +#include <linux/config.h> +#include <linux/init.h> #include <asm/dec/machtype.h> #ifdef CONFIG_ZS @@ -44,7 +45,7 @@ extern long dz_serial_console_init(long, long); #ifdef CONFIG_SERIAL -__initfunc(int rs_init(void)) +int __init rs_init(void) { #if defined(CONFIG_ZS) && defined(CONFIG_DZ) @@ -72,7 +73,7 @@ __initfunc(int rs_init(void)) /* serial_console_init handles the special case of starting * up the console on the serial port */ -__initfunc(long serial_console_init(long kmem_start, long kmem_end)) +long __init serial_console_init(long kmem_start, long kmem_end) { #if defined(CONFIG_ZS) && defined(CONFIG_DZ) if (IOASIC) |