Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4b156d4 authored by Adrian Bunk's avatar Adrian Bunk Committed by Ralf Baechle
Browse files

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



Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 42d226c7

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

include/asm-mips/war.h

+6 −8
Original line number Diff line number Diff line
@@ -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