Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Mon, 14 Jul 2008 06:55:05 -0700
Received: from dalesmta2-1.messageone.com ([129.41.169.249]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Mon, 14 Jul 2008 06:55:04 -0700
Received: from ftp.linux-mips.org (ftp.linux-mips.org [213.58.128.207])
	by dalesmta2-1.messageone.com (8.13.8/8.13.8) with ESMTP id m6EDt1Ff028179
	for <andy.sharp@onstor.com>; Mon, 14 Jul 2008 08:55:04 -0500
Received: from localhost.localdomain ([127.0.0.1]:45462 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S28577590AbYGNNyx (ORCPT <rfc822;andy.sharp@onstor.com>);
	Mon, 14 Jul 2008 14:54:53 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 14 Jul 2008 14:54:36 +0100 (BST)
Received: from elvis.franken.de ([193.175.24.41]:32463 "EHLO elvis.franken.de")
	by ftp.linux-mips.org with ESMTP id S28577573AbYGNNye (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Mon, 14 Jul 2008 14:54:34 +0100
Received: from uucp (helo=solo.franken.de)
	by elvis.franken.de with local-bsmtp (Exim 3.36 #1)
	id 1KIOVd-0003P9-00; Mon, 14 Jul 2008 15:54:33 +0200
Received: by solo.franken.de (Postfix, from userid 1000)
	id F2578DE7B3; Mon, 14 Jul 2008 15:54:30 +0200 (CEST)
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Subject: [PATCH] Remove mips_machtype from EMMA2RH machines
To: linux-mips@linux-mips.org
cc: ralf@linux-mips.org
Message-Id: <20080714135430.F2578DE7B3@solo.franken.de>
Date: 	Mon, 14 Jul 2008 15:54:30 +0200 (CEST)
X-archive-position: 19825
X-ecartis-version: Ecartis v1.0.0
Sender: linux-mips-bounce@linux-mips.org
Errors-to: linux-mips-bounce@linux-mips.org
X-original-sender: tsbogend@alpha.franken.de
Precedence: bulk
X-list: 	linux-mips
X-MessageOne-Virus-Version: vendor=fsecure engine=4.65.7161:2.4.4,1.2.40,4.0.164 definitions=2008-07-14_03:2008-07-09,2008-07-14,2008-07-14 signatures=0
X-MessageOne-Virus-Scanned: Clean
X-MessageOne-Envelope-Sender: linux-mips-bounce@linux-mips.org
X-MessageOne-Spam-Details: rule=m773emszm_notspam policy=m773emszm score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=3.1.0-0805090000 definitions=main-0807140055
X-MessageOne-Spam-Score: 0
X-MessageOne-Spam-Bar: 
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 14 Jul 2008 13:55:05.0159 (UTC) FILETIME=[38048570:01C8E5B9]

This is the EMMA2RH part of the mips_machtype removal.

Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---

This patch is against the queue tree.

 arch/mips/emma2rh/common/prom.c |   15 +++++++--------
 include/asm-mips/bootinfo.h     |    5 -----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/arch/mips/emma2rh/common/prom.c b/arch/mips/emma2rh/common/prom.c
index 0f791eb..38ce477 100644
--- 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 653096a..51dbec9 100644
--- a/include/asm-mips/bootinfo.h
+++ b/include/asm-mips/bootinfo.h
@@ -47,11 +47,6 @@
 #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
  */
 #define MACH_MSP4200_EVAL       0	/* PMC-Sierra MSP4200 Evaluation */

