summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/3com/Kconfig
diff options
context:
space:
mode:
authorMatthew Whitehead <tedheadster@gmail.com>2013-10-02 11:08:03 -0400
committerDavid S. Miller <davem@davemloft.net>2013-10-03 15:55:24 -0400
commit1d3d59108e53ce9815651ee20633506d559bacf6 (patch)
tree34c9bb6564bb616ac45790783b2609765a6e2ea4 /drivers/net/ethernet/3com/Kconfig
parent34a6eda163975de55c5d6810276c5fa37087e366 (diff)
downloadblackbird-obmc-linux-1d3d59108e53ce9815651ee20633506d559bacf6.tar.gz
blackbird-obmc-linux-1d3d59108e53ce9815651ee20633506d559bacf6.zip
3com: Fix drivers/net/ethernet/3com/Kconfig references to PCMCIA and 3c515
The Vortex driver works with PCI and Cardbus devices, not PCMCIA. There never was an EISA 3c515 card, only ISA, so remove that option. Signed-off-by: Matthew Whitehead <tedheadster@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/3com/Kconfig')
-rw-r--r--drivers/net/ethernet/3com/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index f00c76377b44..65b735d4a6ad 100644
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -35,7 +35,7 @@ config EL3
config 3C515
tristate "3c515 ISA \"Fast EtherLink\""
- depends on (ISA || EISA) && ISA_DMA_API
+ depends on ISA && ISA_DMA_API
---help---
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
network card, say Y and read the Ethernet-HOWTO, available from
@@ -70,7 +70,7 @@ config VORTEX
select MII
---help---
This option enables driver support for a large number of 10Mbps and
- 10/100Mbps EISA, PCI and PCMCIA 3Com network cards:
+ 10/100Mbps EISA, PCI and Cardbus 3Com network cards:
"Vortex" (Fast EtherLink 3c590/3c592/3c595/3c597) EISA and PCI
"Boomerang" (EtherLink XL 3c900 or 3c905) PCI
OpenPOWER on IntegriCloud