summaryrefslogtreecommitdiffstats
path: root/arch/mips/sgi/kernel/time.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/time.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/sgi/kernel/time.c')
-rw-r--r--arch/mips/sgi/kernel/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/sgi/kernel/time.c b/arch/mips/sgi/kernel/time.c
index 7dc5a4d53..355f1c471 100644
--- a/arch/mips/sgi/kernel/time.c
+++ b/arch/mips/sgi/kernel/time.c
@@ -1,4 +1,4 @@
-/* $Id: time.c,v 1.2 1998/03/27 08:53:45 ralf Exp $
+/* $Id: time.c,v 1.2 1998/04/05 11:24:00 ralf Exp $
* time.c: Generic SGI time_init() code, this will dispatch to the
* appropriate per-architecture time/counter init code.
*
@@ -8,7 +8,7 @@
extern void indy_timer_init(void);
-__initfunc(void time_init(void))
+void __init time_init(void)
{
/* XXX assume INDY for now XXX */
indy_timer_init();