From: Matthew Whitehead Date: Wed, 2 Oct 2013 15:08:03 +0000 (-0400) Subject: 3com: Fix drivers/net/ethernet/3com/Kconfig references to PCMCIA and 3c515 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1d3d59108e53ce9815651ee20633506d559bacf6;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 Signed-off-by: David S. Miller --- 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