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
Date: Tue, 19 Jun 2007 22:27:04 +0200 [thread overview]
Message-ID: <20070619202704.GG12950@stusta.de> (raw)
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
next reply other threads:[~2007-06-19 20:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-19 20:27 Adrian Bunk [this message]
2007-06-20 7:48 ` [2.6 patch] more MOMENCO_JAGUAR_ATX removal Ralf Baechle
2007-06-20 14:16 ` Franck Bui-Huu
2007-06-20 14:20 ` Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070619202704.GG12950@stusta.de \
--to=bunk@stusta.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=ralf@linux-mips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox