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>

diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
index eb56174469a7f9d90f96f8f8dc2858b0b0c4addb..8c417ed339b4ee29c0aba16c58f08885e26b5ea8 100644 (file)
--- a/drivers/net/ethernet/3com/Kconfig
+++ b/drivers/net/ethernet/3com/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_3COM
        bool "3Com devices"
        default y
-       depends on ISA || EISA || MCA || PCI || PCMCIA
+       depends on ISA || EISA || PCI || PCMCIA
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y
          and read the Ethernet-HOWTO, available from
@@ -33,8 +33,8 @@ config EL1
          will be called 3c501.
 
 config EL3
-       tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
-       depends on (ISA || EISA || MCA)
+       tristate "3c509/3c579 \"EtherLink III\" support"
+       depends on (ISA || EISA)
        ---help---
          If you have a network (Ethernet) card belonging to the 3Com
          EtherLinkIII series, say Y and read the Ethernet-HOWTO, available

diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig
index e1219e037c04de3bd3fb9a7ec39e324b3e8d83c9..880121730cb0c817ef8032d4a742c3f3301d7461 100644 (file)
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -6,8 +6,8 @@ config NET_VENDOR_8390
        bool "National Semi-conductor 8390 devices"
        default y
        depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \
-                  ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \
-                  MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \
+                  ISA || EISA || MAC || M32R || MACH_TX49XX || \
+                  H8300 || ARM || MIPS || ZORRO || PCMCIA || \
                   EXPERIMENTAL)
        ---help---
          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
          NE2000 and clone support" under "EISA, VLB, PCI and on board
-         controllers" below. If you have a NE2000 card and are running on
-         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.
+         controllers" below.
 
          To compile this driver as a module, choose M here. The module
          will be called ne.

diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile
index f43038babf86e96898045502b42e081d384de28b..8fb462cb9774ddd097b5bf53ba34f7c6200a11ea 100644 (file)
--- a/drivers/net/ethernet/8390/Makefile
+++ b/drivers/net/ethernet/8390/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_HYDRA) += hydra.o 8390.o
 obj-$(CONFIG_LNE390) += lne390.o 8390.o
 obj-$(CONFIG_MCF8390) += mcf8390.o 8390.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_NE3210) += ne3210.o 8390.o
 obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o

diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig
index 8350f4b37a8a00727afb56000a5c88856abad925..304613302f0102274040b5fecf80cef7cca077ef 100644 (file)
--- a/drivers/net/ethernet/amd/Kconfig
+++ b/drivers/net/ethernet/amd/Kconfig
@@ -7,7 +7,7 @@ config NET_VENDOR_AMD
        default y
        depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \
                   SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \
-                  (ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA
+                  (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA
        ---help---
          If you have a network (Ethernet) chipset belonging to this class,
          say Y.
@@ -107,7 +107,7 @@ config DECLANCE
 
 config DEPCA
        tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support"
-       depends on (ISA || EISA || MCA)
+       depends on (ISA || EISA)
        select CRC32
        ---help---
          If you have a network (Ethernet) card of this type, say Y and read

diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
index dffee9d44fd55ee13f2ba226c016f8b592eaac12..aca156888fd894f7d9eacb64b2de45c936bdb9f1 100644 (file)
--- a/drivers/net/ethernet/fujitsu/Kconfig
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -5,7 +5,7 @@
 config NET_VENDOR_FUJITSU
        bool "Fujitsu devices"
        default y
-       depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
+       depends on ISA || PCMCIA || (ISA && EXPERIMENTAL)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y
          and read the Ethernet-HOWTO, available from
@@ -19,7 +19,7 @@ if NET_VENDOR_FUJITSU
 
 config AT1700
        tristate "AT1700/1720 support (EXPERIMENTAL)"
-       depends on (ISA || MCA_LEGACY) && EXPERIMENTAL
+       depends on ISA && EXPERIMENTAL
        select CRC32
        ---help---
          If you have a network (Ethernet) card of this type, say Y and read

diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 959faf7388e21ba77316d1817f66e337d6f89315..70f8c2d221b63b91854f31f84421f76c7f5ffc42 100644 (file)
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_I825XX
        bool "Intel (82586/82593/82596) devices"
        default y
        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)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y

diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index ddee4060948a3688d884b3591bdc7aee4d992992..bde4f3db328fddfef3290fb39c6d66dd85c6cba6 100644 (file)
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -6,7 +6,7 @@ config NET_VENDOR_INTEL
        bool "Intel devices"
        default y
        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 || \
                   (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \
                   EXPERIMENTAL