summaryrefslogtreecommitdiffstats
path: root/arch/mips/arc/printf.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /arch/mips/arc/printf.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/arc/printf.c')
-rw-r--r--arch/mips/arc/printf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/arc/printf.c b/arch/mips/arc/printf.c
index 422578017..17e5fe352 100644
--- a/arch/mips/arc/printf.c
+++ b/arch/mips/arc/printf.c
@@ -4,7 +4,7 @@
*
* Copyright (C) 1996 David S. Miller (dm@sgi.com)
*
- * $Id: printf.c,v 1.1 1998/10/18 13:32:09 tsbogend Exp $
+ * $Id: printf.c,v 1.2 1999/06/12 18:42:38 ulfc Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
@@ -16,7 +16,7 @@ static char ppbuf[1024];
#ifdef CONFIG_SGI_PROM_CONSOLE
void prom_printf(char *fmt, ...)
#else
-__initfunc(void prom_printf(char *fmt, ...))
+void __init prom_printf(char *fmt, ...)
#endif
{
va_list args;