[MIPS] Remove mips_machtype from EMMA2RH machines

This is the EMMA2RH part of the mips_machtype removal.

[Ralf: Fixed to the #error statements]

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 0f791eb6bb66c64a3acc37d279a3b2d0cab5d77a..5e92b3a9c5b894227ffe91c0b78351650c1d3a2a 100644 (file)
--- a/arch/mips/emma2rh/common/prom.c
+++ b/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/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h
index 653096a69d166fb6f406a7cf2537e761d37e82c1..51dbec9dabfd6a5b2cf31e61943c78798c2ae6fc 100644 (file)
--- a/include/asm-mips/bootinfo.h
+++ b/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
  */