aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r--drivers/net/Kconfig15
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a3d46ea37126..545c405a5cb0 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -486,8 +486,8 @@ config SGI_IOC3_ETH_HW_TX_CSUM
486 enables offloading for checksums on transmit. If unsure, say Y. 486 enables offloading for checksums on transmit. If unsure, say Y.
487 487
488config MIPS_SIM_NET 488config MIPS_SIM_NET
489 tristate "MIPS simulator Network device (EXPERIMENTAL)" 489 tristate "MIPS simulator Network device"
490 depends on MIPS_SIM && EXPERIMENTAL 490 depends on NET_ETHERNET && MIPS_SIM
491 help 491 help
492 The MIPSNET device is a simple Ethernet network device which is 492 The MIPSNET device is a simple Ethernet network device which is
493 emulated by the MIPS Simulator. 493 emulated by the MIPS Simulator.
@@ -1444,7 +1444,8 @@ config CS89x0
1444 1444
1445config TC35815 1445config TC35815
1446 tristate "TOSHIBA TC35815 Ethernet support" 1446 tristate "TOSHIBA TC35815 Ethernet support"
1447 depends on NET_PCI && PCI && TOSHIBA_JMR3927 1447 depends on NET_PCI && PCI && MIPS
1448 select MII
1448 1449
1449config DGRS 1450config DGRS
1450 tristate "Digi Intl. RightSwitch SE-X support" 1451 tristate "Digi Intl. RightSwitch SE-X support"
@@ -2291,14 +2292,10 @@ config UGETH_FILTERING
2291 bool "Mac address filtering support" 2292 bool "Mac address filtering support"
2292 depends on UCC_GETH 2293 depends on UCC_GETH
2293 2294
2294config UGETH_TX_ON_DEMOND 2295config UGETH_TX_ON_DEMAND
2295 bool "Transmit on Demond support" 2296 bool "Transmit on Demand support"
2296 depends on UCC_GETH 2297 depends on UCC_GETH
2297 2298
2298config UGETH_HAS_GIGA
2299 bool
2300 depends on UCC_GETH && PPC_MPC836x
2301
2302config MV643XX_ETH 2299config MV643XX_ETH
2303 tristate "MV-643XX Ethernet support" 2300 tristate "MV-643XX Ethernet support"
2304 depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32) 2301 depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)