patch-2.4.10 linux/arch/mips/dec/prom/init.c
Next file: linux/arch/mips/dec/prom/memory.c
Previous file: linux/arch/mips/dec/prom/cmdline.c
Back to the patch index
Back to the overall index
- Lines: 40
- Date:
Sun Sep 9 10:43:01 2001
- Orig file:
v2.4.9/linux/arch/mips/dec/prom/init.c
- Orig date:
Sat May 13 08:29:14 2000
diff -u --recursive --new-file v2.4.9/linux/arch/mips/dec/prom/init.c linux/arch/mips/dec/prom/init.c
@@ -2,12 +2,11 @@
* init.c: PROM library initialisation code.
*
* Copyright (C) 1998 Harald Koerfgen
- *
- * $Id: init.c,v 1.3 1999/08/09 19:43:13 harald Exp $
*/
#include <linux/init.h>
#include <linux/config.h>
#include <asm/bootinfo.h>
+#include <asm/cpu.h>
#include "prom.h"
/*
@@ -93,15 +92,17 @@
/* Were we compiled with the right CPU option? */
#if defined(CONFIG_CPU_R3000)
- if ((mips_cputype == CPU_R4000SC) || (mips_cputype == CPU_R4400SC)) {
+ if ((mips_cpu.cputype == CPU_R4000SC) ||
+ (mips_cpu.cputype == CPU_R4400SC)) {
prom_printf("Sorry, this kernel is compiled for the wrong CPU type!\n");
prom_printf("Please recompile with \"CONFIG_CPU_R4x00 = y\"\n");
dec_machine_halt();
}
#endif
-#if defined(CONFIG_CPU_R4x00)
- if ((mips_cputype == CPU_R3000) || (mips_cputype == CPU_R3000A)) {
+#if defined(CONFIG_CPU_R4X00)
+ if ((mips_cpu.cputype == CPU_R3000) ||
+ (mips_cpu.cputype == CPU_R3000A)) {
prom_printf("Sorry, this kernel is compiled for the wrong CPU type!\n");
prom_printf("Please recompile with \"CONFIG_CPU_R3000 = y\"\n");
dec_machine_halt();
@@ -114,3 +115,4 @@
return 0;
}
+
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)