summaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi/kernel/indy_sc.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_sc.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/sgi/kernel/indy_sc.c')
-rw-r--r--arch/mips/sgi/kernel/indy_sc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi/kernel/indy_sc.c b/arch/mips/sgi/kernel/indy_sc.c
index 1fecee23f..461691304 100644
--- a/arch/mips/sgi/kernel/indy_sc.c
+++ b/arch/mips/sgi/kernel/indy_sc.c
@@ -1,4 +1,4 @@
-/* $Id: indy_sc.c,v 1.9 1999/05/12 21:57:49 ulfc Exp $
+/* $Id: indy_sc.c,v 1.10 1999/09/28 22:25:49 ralf Exp $
*
* indy_sc.c: Indy cache managment functions.
*
@@ -150,7 +150,7 @@ static void indy_sc_disable(void)
" : "=r" (tmp1), "=r" (tmp2), "=r" (tmp3));
}
-__initfunc(static inline int indy_sc_probe(void))
+static inline int __init indy_sc_probe(void)
{
volatile unsigned int *cpu_control;
unsigned short cmd = 0xc220;
@@ -219,7 +219,7 @@ struct bcache_ops indy_sc_ops = {
indy_sc_wback_invalidate
};
-__initfunc(void indy_sc_init(void))
+void __init indy_sc_init(void)
{
if (indy_sc_probe()) {
indy_sc_enable();