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/sgi/kernel/system.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'arch/mips/sgi/kernel/system.c')
| -rw-r--r-- | arch/mips/sgi/kernel/system.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/sgi/kernel/system.c b/arch/mips/sgi/kernel/system.c index d6b02c4c1..7f5a3130b 100644 --- a/arch/mips/sgi/kernel/system.c +++ b/arch/mips/sgi/kernel/system.c @@ -3,7 +3,7 @@ * * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com) * - * $Id: system.c,v 1.6 1998/10/18 13:51:49 tsbogend Exp $ + * $Id: system.c,v 1.7 1998/10/18 22:55:34 tsbogend Exp $ */ #include <linux/init.h> #include <linux/kernel.h> @@ -35,7 +35,7 @@ static struct smatch sgi_cputable[] = { #define NUM_CPUS 9 /* for now */ -__initfunc(static int string_to_cpu(char *s)) +static int __init string_to_cpu(char *s) { int i; @@ -54,7 +54,7 @@ __initfunc(static int string_to_cpu(char *s)) * We' call this early before loadmmu(). If we do the other way around * the firmware will crash and burn. */ -__initfunc(void sgi_sysinit(void)) +void __init sgi_sysinit(void) { pcomponent *p, *toplev, *cpup = 0; int cputype = -1; |