summaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi/kernel/indy_mc.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/sgi/kernel/indy_mc.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/sgi/kernel/indy_mc.c')
-rw-r--r--arch/mips/sgi/kernel/indy_mc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi/kernel/indy_mc.c b/arch/mips/sgi/kernel/indy_mc.c
index 1cd05afc8..acd07cfdc 100644
--- a/arch/mips/sgi/kernel/indy_mc.c
+++ b/arch/mips/sgi/kernel/indy_mc.c
@@ -4,7 +4,7 @@
* Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
* Copyright (C) 1999 Andrew R. Baker (andrewb@uab.edu) - Indigo2 changes
*
- * $Id: indy_mc.c,v 1.3 1998/05/04 09:12:57 ralf Exp $
+ * $Id: indy_mc.c,v 1.4 1999/05/07 22:34:32 ulfc Exp $
*/
#include <linux/init.h>
#include <linux/kernel.h>
@@ -47,7 +47,7 @@ static inline char *mconfig_string(unsigned long val)
};
}
-__initfunc(void sgimc_init(void))
+void __init sgimc_init(void)
{
unsigned long tmpreg;