---

yaml --- r: 101471 b: refs/heads/master c: 0b56fd8 h: refs/heads/master i: 101469: 7e62691 101467: 4dc022d 101463: 67030d1 101455: 6a7a997 101439: 488d078 v: v3
git-mirror · Jul 15, 2008 · 373a7f5 · 373a7f5
1 parent aa857c9
commit 373a7f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c660729501894e0b88054ad4b66a5f98a1a2a37e
+refs/heads/master: 0b56fd8c7abbf85baeecb77be25c54d3c7d11587
diff --git a/trunk/arch/mips/emma2rh/common/prom.c b/trunk/arch/mips/emma2rh/common/prom.c
@@ -34,12 +34,11 @@
 
 const char *get_system_type(void)
 {
-	switch (mips_machtype) {
-	case MACH_NEC_MARKEINS:
-		return "NEC EMMA2RH Mark-eins";
-	default:
-		return "Unknown NEC board";
-	}
+#if defined(CONFIG_MARKEINS)
+	return "NEC EMMA2RH Mark-eins";
+#else
+#error  Unknown NEC board
+#endif
 }
 
 /* [jsun@junsun.net] PMON passes arguments in C main() style */
@@ -63,10 +62,10 @@ void __init prom_init(void)
 	}
 
 #if defined(CONFIG_MARKEINS)
-	mips_machtype = MACH_NEC_MARKEINS;
 	add_memory_region(0, EMMA2RH_RAM_SIZE, BOOT_MEM_RAM);
+#else
+#error  Unknown NEC board
 #endif
-
 }
 
 void __init prom_free_prom_memory(void)

diff --git a/trunk/include/asm-mips/bootinfo.h b/trunk/include/asm-mips/bootinfo.h
@@ -46,11 +46,6 @@
 #define  MACH_LASAT_100		0	/* Masquerade II/SP100/SP50/SP25 */
 #define  MACH_LASAT_200		1	/* Masquerade PRO/SP200 */
 
-/*
- * Valid machtype for group NEC EMMA2RH
- */
-#define  MACH_NEC_MARKEINS	0	/* NEC EMMA2RH Mark-eins	*/
-
 /*
  * Valid machtype for group PMC-MSP
  */