From 373a7f5818722fcfcecf9b11e8e87c3c7e0c96a0 Mon Sep 17 00:00:00 2001
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Mon, 14 Jul 2008 15:54:30 +0200
Subject: [PATCH] --- yaml --- r: 101471 b: refs/heads/master c:
 0b56fd8c7abbf85baeecb77be25c54d3c7d11587 h: refs/heads/master i:   101469:
 7e62691eb181bc2427d6c368794879661249c739   101467:
 4dc022d9aa1d5170ba75fb885388690620b6dfb1   101463:
 67030d14e7f0e2a324d6e7c80dd9df0d6148291b   101455:
 6a7a997f6c02cd26be975e1952fe27b375525dfd   101439:
 488d0786758342d31cd68045108e209d28a228fa v: v3

---
 [refs]                                |  2 +-
 trunk/arch/mips/emma2rh/common/prom.c | 15 +++++++--------
 trunk/include/asm-mips/bootinfo.h     |  5 -----
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 3a31bb4c9fe2..f52e51d1af06 100644
--- 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
index 0f791eb6bb66..5e92b3a9c5b8 100644
--- 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
index 653096a69d16..51dbec9dabfd 100644
--- 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
  */