[2.6 patch] more MOMENCO_JAGUAR_ATX removal
From: Adrian Bunk <hidden>
Date: 2007-06-19 20:27:01
Also in:
lkml
This patch removes the few leftovers of the MOMENCO_JAGUAR_ATX removal. Signed-off-by: Adrian Bunk <redacted> --- 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