diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-08-20 21:58:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-08-20 21:58:59 +0000 |
| commit | 892bf98f0c04e9297979936d973c85e62a3f0b96 (patch) | |
| tree | 3f9570013732b9472502e71b25d5a76591eaed9a /arch/mips/kernel | |
| parent | d4339ea6c6ab0bdf909d587bd9c5a754e362833d (diff) | |
More MIPS64 chainsawing.
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/mips/kernel/head.S | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/mips_ksyms.c | 4 | ||||
| -rw-r--r-- | arch/mips/kernel/setup.c | 7 |
4 files changed, 9 insertions, 8 deletions
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile index a1e6a6d29..58c4b85c2 100644 --- a/arch/mips/kernel/Makefile +++ b/arch/mips/kernel/Makefile @@ -35,7 +35,7 @@ endif # # SGIs have very different interrupt/timer hardware. # -ifndef CONFIG_SGI +ifndef CONFIG_SGI_IP22 ifndef CONFIG_DECSTATION ifndef CONFIG_BAGET_MIPS O_OBJS += irq.o time.o diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index acc666083..f6af1d6be 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -1,4 +1,4 @@ -/* $Id: head.S,v 1.12 1999/07/26 19:42:40 harald Exp $ +/* $Id: head.S,v 1.13 1999/08/18 23:37:43 ralf Exp $ * * arch/mips/kernel/head.S * @@ -427,7 +427,7 @@ probe_done: jal prom_init /* prom_init(argc, argv, envp); */ nop -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 jal sgi_sysinit nop #endif diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c index 612170b20..7d5044942 100644 --- a/arch/mips/kernel/mips_ksyms.c +++ b/arch/mips/kernel/mips_ksyms.c @@ -1,4 +1,4 @@ -/* $Id: mips_ksyms.c,v 1.18 1999/04/05 01:30:49 ulfc Exp $ +/* $Id: mips_ksyms.c,v 1.19 1999/04/11 18:37:55 harald Exp $ * * Export MIPS-specific functions needed for loadable modules. * @@ -99,7 +99,7 @@ EXPORT_SYMBOL(vdma_free); EXPORT_SYMBOL(vdma_log2phys); #endif -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 EXPORT_SYMBOL(hpc3c0); #endif diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 5040f5f15..89e4f7b37 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.15 1999/05/01 22:40:37 ralf Exp $ +/* $Id: setup.c,v 1.16 1999/06/17 13:25:47 ralf Exp $ * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive @@ -40,7 +40,7 @@ #include <asm/io.h> #include <asm/stackframe.h> #include <asm/system.h> -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 #include <asm/sgialib.h> #endif @@ -193,7 +193,8 @@ __initfunc(void setup_arch(char **cmdline_p, jazz_setup(); break; #endif -#ifdef CONFIG_SGI +#ifdef CONFIG_SGI_IP22 + /* As of now this is only IP22. */ case MACH_GROUP_SGI: sgi_setup(); break; |