drivers/net: remove orphaned references to micro channel
We threw away the microchannel support, but the removal wasn't completely trivial since there was namespace overlap with the machine check support, and hence some orphaned dependencies survived the deletion. This attempts to sweep those up and send them to the bit-bucket. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3066af582f
commit
483f777266
|
@ -5,7 +5,7 @@
|
||||||
config NET_VENDOR_3COM
|
config NET_VENDOR_3COM
|
||||||
bool "3Com devices"
|
bool "3Com devices"
|
||||||
default y
|
default y
|
||||||
depends on ISA || EISA || MCA || PCI || PCMCIA
|
depends on ISA || EISA || PCI || PCMCIA
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card belonging to this class, say Y
|
If you have a network (Ethernet) card belonging to this class, say Y
|
||||||
and read the Ethernet-HOWTO, available from
|
and read the Ethernet-HOWTO, available from
|
||||||
|
@ -33,8 +33,8 @@ config EL1
|
||||||
will be called 3c501.
|
will be called 3c501.
|
||||||
|
|
||||||
config EL3
|
config EL3
|
||||||
tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
|
tristate "3c509/3c579 \"EtherLink III\" support"
|
||||||
depends on (ISA || EISA || MCA)
|
depends on (ISA || EISA)
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card belonging to the 3Com
|
If you have a network (Ethernet) card belonging to the 3Com
|
||||||
EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
|
EtherLinkIII series, say Y and read the Ethernet-HOWTO, available
|
||||||
|
|
|
@ -6,8 +6,8 @@ config NET_VENDOR_8390
|
||||||
bool "National Semi-conductor 8390 devices"
|
bool "National Semi-conductor 8390 devices"
|
||||||
default y
|
default y
|
||||||
depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
|
depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
|
||||||
ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
|
ISA || EISA || MAC || M32R || MACH_TX49XX || \
|
||||||
MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
|
H8300 || ARM || MIPS || ZORRO || PCMCIA || \
|
||||||
EXPERIMENTAL)
|
EXPERIMENTAL)
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card belonging to this class, say Y
|
If you have a network (Ethernet) card belonging to this class, say Y
|
||||||
|
@ -188,10 +188,7 @@ config NE2000
|
||||||
|
|
||||||
If you have a PCI NE2000 card however, say N here and Y to "PCI
|
If you have a PCI NE2000 card however, say N here and Y to "PCI
|
||||||
NE2000 and clone support" under "EISA, VLB, PCI and on board
|
NE2000 and clone support" under "EISA, VLB, PCI and on board
|
||||||
controllers" below. If you have a NE2000 card and are running on
|
controllers" below.
|
||||||
an MCA system (a bus system used on some IBM PS/2 computers and
|
|
||||||
laptops), say N here and Y to "NE/2 (ne2000 MCA version) support",
|
|
||||||
below.
|
|
||||||
|
|
||||||
To compile this driver as a module, choose M here. The module
|
To compile this driver as a module, choose M here. The module
|
||||||
will be called ne.
|
will be called ne.
|
||||||
|
|
|
@ -16,7 +16,6 @@ obj-$(CONFIG_HYDRA) += hydra.o 8390.o
|
||||||
obj-$(CONFIG_LNE390) += lne390.o 8390.o
|
obj-$(CONFIG_LNE390) += lne390.o 8390.o
|
||||||
obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o
|
obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o
|
||||||
obj-$(CONFIG_NE2000) += ne.o 8390p.o
|
obj-$(CONFIG_NE2000) += ne.o 8390p.o
|
||||||
obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o
|
|
||||||
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
|
obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
|
||||||
obj-$(CONFIG_NE3210) += ne3210.o 8390.o
|
obj-$(CONFIG_NE3210) += ne3210.o 8390.o
|
||||||
obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
|
obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o
|
||||||
|
|
|
@ -7,7 +7,7 @@ config NET_VENDOR_AMD
|
||||||
default y
|
default y
|
||||||
depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
|
depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
|
||||||
SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
|
SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
|
||||||
(ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA
|
(ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) chipset belonging to this class,
|
If you have a network (Ethernet) chipset belonging to this class,
|
||||||
say Y.
|
say Y.
|
||||||
|
@ -107,7 +107,7 @@ config DECLANCE
|
||||||
|
|
||||||
config DEPCA
|
config DEPCA
|
||||||
tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
|
tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
|
||||||
depends on (ISA || EISA || MCA)
|
depends on (ISA || EISA)
|
||||||
select CRC32
|
select CRC32
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card of this type, say Y and read
|
If you have a network (Ethernet) card of this type, say Y and read
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
config NET_VENDOR_FUJITSU
|
config NET_VENDOR_FUJITSU
|
||||||
bool "Fujitsu devices"
|
bool "Fujitsu devices"
|
||||||
default y
|
default y
|
||||||
depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
|
depends on ISA || PCMCIA || (ISA && EXPERIMENTAL)
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card belonging to this class, say Y
|
If you have a network (Ethernet) card belonging to this class, say Y
|
||||||
and read the Ethernet-HOWTO, available from
|
and read the Ethernet-HOWTO, available from
|
||||||
|
@ -19,7 +19,7 @@ if NET_VENDOR_FUJITSU
|
||||||
|
|
||||||
config AT1700
|
config AT1700
|
||||||
tristate "AT1700/1720 support (EXPERIMENTAL)"
|
tristate "AT1700/1720 support (EXPERIMENTAL)"
|
||||||
depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
|
depends on ISA && EXPERIMENTAL
|
||||||
select CRC32
|
select CRC32
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card of this type, say Y and read
|
If you have a network (Ethernet) card of this type, say Y and read
|
||||||
|
|
|
@ -6,7 +6,7 @@ config NET_VENDOR_I825XX
|
||||||
bool "Intel (82586/82593/82596) devices"
|
bool "Intel (82586/82593/82596) devices"
|
||||||
default y
|
default y
|
||||||
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
|
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
|
||||||
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
|
ARCH_ACORN || SNI_RM || SUN3 || \
|
||||||
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
|
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
|
||||||
---help---
|
---help---
|
||||||
If you have a network (Ethernet) card belonging to this class, say Y
|
If you have a network (Ethernet) card belonging to this class, say Y
|
||||||
|
|
|
@ -6,7 +6,7 @@ config NET_VENDOR_INTEL
|
||||||
bool "Intel devices"
|
bool "Intel devices"
|
||||||
default y
|
default y
|
||||||
depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
|
depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \
|
||||||
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
|
ARCH_ACORN || SNI_RM || SUN3 || \
|
||||||
GSC || BVME6000 || MVME16x || \
|
GSC || BVME6000 || MVME16x || \
|
||||||
(ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
|
(ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
|
||||||
EXPERIMENTAL
|
EXPERIMENTAL
|
||||||
|
|
Loading…
Reference in New Issue