diff options
| author | Adrian Bunk | 2007-06-19 22:27:04 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2007-07-10 18:33:02 +0200 |
| commit | a4b156d47d204904fa104c3e585b4c67b89195f3 (patch) | |
| tree | 02d90a206fa1c86787bf94b35adcdd93c11339ba | |
| parent | [MIPS] New files for lemote fulong mini-PC support (diff) | |
| download | kernel-qcow2-linux-a4b156d47d204904fa104c3e585b4c67b89195f3.tar.gz kernel-qcow2-linux-a4b156d47d204904fa104c3e585b4c67b89195f3.tar.xz kernel-qcow2-linux-a4b156d47d204904fa104c3e585b4c67b89195f3.zip | |
[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>
| -rw-r--r-- | drivers/net/Kconfig | 2 | ||||
| -rw-r--r-- | include/asm-mips/war.h | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 62a1390458c3..3d5db2597b88 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2307,7 +2307,7 @@ config UGETH_TX_ON_DEMAND config MV643XX_ETH 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 help This driver supports the gigabit Ethernet on the Marvell MV643XX diff --git a/include/asm-mips/war.h b/include/asm-mips/war.h index 4396b2fb5e2d..c507f1b8014e 100644 --- a/include/asm-mips/war.h +++ b/include/asm-mips/war.h @@ -169,10 +169,9 @@ /* * 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 #endif @@ -182,11 +181,10 @@ * I-cache line worth of instructions being fetched may case spurious * 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 #endif |