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/arc/console.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/arc/console.c')
| -rw-r--r-- | arch/mips/arc/console.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/arc/console.c b/arch/mips/arc/console.c index beca1543d..4675eb4a1 100644 --- a/arch/mips/arc/console.c +++ b/arch/mips/arc/console.c @@ -4,7 +4,7 @@ * Copyright (C) 1996 David S. Miller (dm@sgi.com) * Compability with board caches, Ulf Carlsson * - * $Id: console.c,v 1.1 1998/10/18 13:32:08 tsbogend Exp $ + * $Id: console.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $ */ #include <linux/init.h> #include <asm/sgialib.h> @@ -22,7 +22,7 @@ extern struct bcache_ops *bcops; #ifdef CONFIG_SGI_PROM_CONSOLE void prom_putchar(char c) #else -__initfunc(void prom_putchar(char c)) +void __init prom_putchar(char c) #endif { long cnt; @@ -36,7 +36,7 @@ __initfunc(void prom_putchar(char c)) #ifdef CONFIG_SGI_PROM_CONSOLE char prom_getchar(void) #else -__initfunc(char prom_getchar(void)) +char __init prom_getchar(void) #endif { long cnt; |