Received: from mail.onstor.com ([66.201.51.107]) by onstor-exch02.onstor.net with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 19 Jun 2007 13:28:02 -0700
Received: from ftp.linux-mips.org ([194.74.144.162]) by mail.onstor.com with Microsoft SMTPSVC(6.0.3790.1830);
	 Tue, 19 Jun 2007 13:28:02 -0700
Received: from localhost.localdomain ([127.0.0.1]:58290 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP
	id S20023791AbXFSU1q (ORCPT <rfc822;dan.stein@onstor.com> + 1 other);
	Tue, 19 Jun 2007 21:27:46 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 19 Jun 2007 21:27:26 +0100 (BST)
Received: from mailout.stusta.mhn.de ([141.84.69.5]:34179 "EHLO
	mailhub.stusta.mhn.de") by ftp.linux-mips.org with ESMTP
	id S20023790AbXFSU1X (ORCPT <rfc822;linux-mips@linux-mips.org>);
	Tue, 19 Jun 2007 21:27:23 +0100
Received: from r063144.stusta.swh.mhn.de (r063144.stusta.swh.mhn.de [10.150.63.144])
	by mailhub.stusta.mhn.de (Postfix) with ESMTP id E98D8181C21;
	Tue, 19 Jun 2007 22:26:47 +0200 (CEST)
Received: by r063144.stusta.swh.mhn.de (Postfix, from userid 1000)
	id 0345E3CE3F6; Tue, 19 Jun 2007 22:27:04 +0200 (CEST)
Date:	Tue, 19 Jun 2007 22:27:04 +0200
From:	Adrian Bunk <bunk@stusta.de>
To:	Ralf Baechle <ralf@linux-mips.org>
Cc:	linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [2.6 patch] more MOMENCO_JAGUAR_ATX removal
Message-ID: <20070619202704.GG12950@stusta.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.5.15+20070412 (2007-04-11)
X-archive-position: 15475
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: bunk@stusta.de
Precedence: bulk
X-list:	linux-mips
Return-Path: linux-mips-bounce@linux-mips.org
X-OriginalArrivalTime: 19 Jun 2007 20:28:02.0598 (UTC) FILETIME=[55BFF460:01C7B2B0]

This patch removes the few leftovers of the MOMENCO_JAGUAR_ATX removal.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 drivers/net/Kconfig    |    2 +-
 include/asm-mips/war.h |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

--- linux-2.6.22-rc4-mm2/drivers/net/Kconfig.old	2007-06-18 15:24:49.000000000 +0200
+++ linux-2.6.22-rc4-mm2/drivers/net/Kconfig	2007-06-18 15:25:02.000000000 +0200
@@ -2362,7 +2362,7 @@
 
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
-	depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
+	depends on MOMENCO_OCELOT_C || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
 	select MII
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX
--- linux-2.6.22-rc4-mm2/include/asm-mips/war.h.old	2007-06-18 15:25:20.000000000 +0200
+++ linux-2.6.22-rc4-mm2/include/asm-mips/war.h	2007-06-18 15:26:03.000000000 +0200
@@ -171,8 +171,7 @@
  * On the RM9000 there is a problem which makes the CreateDirtyExclusive
  * cache operation unusable on SMP systems.
  */
-#if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_PMC_YOSEMITE) || \
-    defined(CONFIG_BASLER_EXCITE)
+#if defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_BASLER_EXCITE)
 #define  RM9000_CDEX_SMP_WAR		1
 #endif
 
@@ -181,8 +180,8 @@
  * where invalid instructions in the same I-cache line worth of instructions
  * being fetched may case spurious exceptions.
  */
-#if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_MOMENCO_OCELOT_3) || \
-    defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_BASLER_EXCITE)
+#if defined(CONFIG_MOMENCO_OCELOT_3) || defined(CONFIG_PMC_YOSEMITE) || \
+    defined(CONFIG_BASLER_EXCITE)
 #define ICACHE_REFILLS_WORKAROUND_WAR	1
 #endif
 


