Explorar el Código

[MIPS] Removes the few leftovers of the MOMENCO_JAGUAR_ATX removal.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Adrian Bunk hace 18 años
padre
commit
a4b156d47d
Se han modificado 2 ficheros con 7 adiciones y 9 borrados
  1. 1 1
      drivers/net/Kconfig
  2. 6 8
      include/asm-mips/war.h

+ 1 - 1
drivers/net/Kconfig

@@ -2307,7 +2307,7 @@ config UGETH_TX_ON_DEMAND
 
 
 config MV643XX_ETH
 config MV643XX_ETH
 	tristate "MV-643XX Ethernet support"
 	tristate "MV-643XX Ethernet support"
-	depends on MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
+	depends on MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
 	select MII
 	select MII
 	help
 	help
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX
 	  This driver supports the gigabit Ethernet on the Marvell MV643XX

+ 6 - 8
include/asm-mips/war.h

@@ -169,10 +169,9 @@
 
 
 /*
 /*
  * On the RM9000 there is a problem which makes the CreateDirtyExclusive
  * On the RM9000 there is a problem which makes the CreateDirtyExclusive
- * cache operation unusable on SMP systems.
+ * eache 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
 #define  RM9000_CDEX_SMP_WAR		1
 #endif
 #endif
 
 
@@ -182,11 +181,10 @@
  * I-cache line worth of instructions being fetched may case spurious
  * I-cache line worth of instructions being fetched may case spurious
  * exceptions.
  * exceptions.
  */
  */
-#if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MOMENCO_JAGUAR_ATX) || \
-    defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA) || \
-    defined(CONFIG_MOMENCO_OCELOT) || defined(CONFIG_MOMENCO_OCELOT_3) || \
-    defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_SGI_IP32) || \
-    defined(CONFIG_WR_PPMC)
+#if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MIPS_ATLAS) || \
+    defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MOMENCO_OCELOT) || \
+    defined(CONFIG_MOMENCO_OCELOT_3) || defined(CONFIG_PMC_YOSEMITE) || \
+    defined(CONFIG_SGI_IP32) || defined(CONFIG_WR_PPMC)
 #define ICACHE_REFILLS_WORKAROUND_WAR	1
 #define ICACHE_REFILLS_WORKAROUND_WAR	1
 #endif
 #endif