patch-2.4.0-test4 linux/arch/mips/kernel/setup.c

• Lines: 56
• Date: Tue Jul 11 11:14:48 2000
• Orig file: v2.4.0-test3/linux/arch/mips/kernel/setup.c
• Orig date: Mon Jul 10 16:47:19 2000

diff -u --recursive --new-file v2.4.0-test3/linux/arch/mips/kernel/setup.c linux/arch/mips/kernel/setup.c
@@ -1,5 +1,4 @@
-/* $Id: setup.c,v 1.28 2000/03/13 22:21:44 harald 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
  * for more details.
@@ -25,6 +24,7 @@
 #include <linux/utsname.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
+#include <linux/bootmem.h>
 #ifdef CONFIG_BLK_DEV_RAM
 #include <linux/blk.h>
 #endif
@@ -201,6 +201,9 @@
 	case PRID_IMP_R10000:
 		mips_cputype = CPU_R10000;
 		break;
+	case PRID_IMP_RM7000:
+		mips_cputype = CPU_R5000;
+		break;
 	default:
 		mips_cputype = CPU_UNKNOWN;
 	}
@@ -250,10 +253,6 @@
 
 void __init setup_arch(char **cmdline_p)
 {
-#ifdef CONFIG_BLK_DEV_INITRD
-	unsigned long tmp;
-	unsigned long *initrd_header;
-#endif
 	void baget_setup(void);
 	void cobalt_setup(void);
 	void decstation_setup(void);
@@ -262,6 +261,7 @@
 	void sni_rm200_pci_setup(void);
 	void sgi_setup(void);
 	void ddb_setup(void);
+	void orion_setup(void);
 
 	/* Save defaults for configuration-dependent routines.  */
 	irq_setup = default_irq_setup;
@@ -316,6 +316,11 @@
 #ifdef CONFIG_DDB5074
 	case MACH_GROUP_NEC_DDB:
 		ddb_setup();
+		break;
+#endif
+#ifdef CONFIG_ORION
+	case MACH_GROUP_ORION:
+		orion_setup();
 		break;
 #endif
 	default: