Skip to contentSkip to conversation

more MOMENCO_JAGUAR_ATX removal

PATCH Applied Adrian Bunk 3 participants 4 messages Jun 19, 2007 – Jun 20, 2007

Subsystems (2)
Network drivers MIPS
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 more MOMENCO_JAGUAR_ATX removal

This patch removes the few leftovers of the MOMENCO_JAGUAR_ATX removal.

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/net/Kconfig    |    2 +-
 include/asm-mips/war.h |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/Kconfig renamed from drivers/net/Kconfig.old +1 -1
@@ -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
include/asm-mips/war.h renamed from include/asm-mips/war.h.old +3 -4
@@ -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
#2 lore raw
In reply to Adrian Bunk

Hi,

Quoted 2 lines · Adrian Bunk

This patch removes the few leftovers of the MOMENCO_JAGUAR_ATX removal.

thanks for catching it,

Quoted 11 lines
Signed-off-by Adrian Bunk <[email protected]>

---

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

drivers/net/Kconfig 2007-06-18 15:25:02.000000000 +0200 line 2365

Quoted 5 lines
drivers/net/Kconfig 2007-06-18 15:25:02.000000000 +0200 renamed from drivers/net/Kconfig.old 2007-06-18 15:24:49.000000000 +0200 +1 -1
@@ -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)

Actually MOMENCO_OCELOT_C has been killed too...

Signature · 1 line
              Franck
#3 lore raw
Quoted 1 line · Franck Bui-Huu

Actually MOMENCO_OCELOT_C has been killed too...

That is queued up for after 2.6.22 is out.

Ralf