diff options
| author | Adrian Bunk <bunk@stusta.de> | 2007-06-19 16:27:04 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 12:33:02 -0400 |
| commit | a4b156d47d204904fa104c3e585b4c67b89195f3 (patch) | |
| tree | 02d90a206fa1c86787bf94b35adcdd93c11339ba | |
| parent | 42d226c7248a28ff8c478c06b7e9bd9ef5d73574 (diff) | |
[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 | |||
| 2307 | 2307 | ||
| 2308 | config MV643XX_ETH | 2308 | config MV643XX_ETH |
| 2309 | tristate "MV-643XX Ethernet support" | 2309 | tristate "MV-643XX Ethernet support" |
| 2310 | depends on MOMENCO_JAGUAR_ATX || MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) | 2310 | depends on MV64360 || MV64X60 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) |
| 2311 | select MII | 2311 | select MII |
| 2312 | help | 2312 | help |
| 2313 | This driver supports the gigabit Ethernet on the Marvell MV643XX | 2313 | 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 @@ | |||
| 169 | 169 | ||
| 170 | /* | 170 | /* |
| 171 | * On the RM9000 there is a problem which makes the CreateDirtyExclusive | 171 | * On the RM9000 there is a problem which makes the CreateDirtyExclusive |
| 172 | * cache operation unusable on SMP systems. | 172 | * eache operation unusable on SMP systems. |
| 173 | */ | 173 | */ |
| 174 | #if defined(CONFIG_MOMENCO_JAGUAR_ATX) || defined(CONFIG_PMC_YOSEMITE) || \ | 174 | #if defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_BASLER_EXCITE) |
| 175 | defined(CONFIG_BASLER_EXCITE) | ||
| 176 | #define RM9000_CDEX_SMP_WAR 1 | 175 | #define RM9000_CDEX_SMP_WAR 1 |
| 177 | #endif | 176 | #endif |
| 178 | 177 | ||
| @@ -182,11 +181,10 @@ | |||
| 182 | * I-cache line worth of instructions being fetched may case spurious | 181 | * I-cache line worth of instructions being fetched may case spurious |
| 183 | * exceptions. | 182 | * exceptions. |
| 184 | */ | 183 | */ |
| 185 | #if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MOMENCO_JAGUAR_ATX) || \ | 184 | #if defined(CONFIG_BASLER_EXCITE) || defined(CONFIG_MIPS_ATLAS) || \ |
| 186 | defined(CONFIG_MIPS_ATLAS) || defined(CONFIG_MIPS_MALTA) || \ | 185 | defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MOMENCO_OCELOT) || \ |
| 187 | defined(CONFIG_MOMENCO_OCELOT) || defined(CONFIG_MOMENCO_OCELOT_3) || \ | 186 | defined(CONFIG_MOMENCO_OCELOT_3) || defined(CONFIG_PMC_YOSEMITE) || \ |
| 188 | defined(CONFIG_PMC_YOSEMITE) || defined(CONFIG_SGI_IP32) || \ | 187 | defined(CONFIG_SGI_IP32) || defined(CONFIG_WR_PPMC) |
| 189 | defined(CONFIG_WR_PPMC) | ||
| 190 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 | 188 | #define ICACHE_REFILLS_WORKAROUND_WAR 1 |
| 191 | #endif | 189 | #endif |
| 192 | 190 | ||