diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /arch/mips/kernel/setup.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'arch/mips/kernel/setup.c')
| -rw-r--r-- | arch/mips/kernel/setup.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 474437ef5..98f99f9f5 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -5,7 +5,7 @@ * Copyright (C) 1995, 1996 Ralf Baechle * Copyright (C) 1996 Stoned Elipot * - * $Id: setup.c,v 1.4 1997/12/01 17:57:31 ralf Exp $ + * $Id: setup.c,v 1.5 1997/12/02 23:44:02 ralf Exp $ */ #include <linux/config.h> #include <linux/errno.h> @@ -175,20 +175,6 @@ __initfunc(void setup_arch(char **cmdline_p, switch(mips_machgroup) { -#ifdef CONFIG_MIPS_DECSTATION - case MACH_GROUP_DEC: - decstation_setup(); - break; -#endif -#if defined(CONFIG_MIPS_ARC) - /* - * Perhaps arch/mips/deskstation should be renamed to arch/mips/arc. - * For now CONFIG_MIPS_ARC means DeskStation. -Stoned. - */ - case MACH_GROUP_ARC: - deskstation_setup(); - break; -#endif #ifdef CONFIG_MIPS_JAZZ case MACH_GROUP_JAZZ: jazz_setup(); |