diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-01-04 11:57:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-07 00:13:33 -0500 |
| commit | 483f777266f5da205459c290994bd3cda5f1f6bc (patch) | |
| tree | b3b1980cbf82f0d4a3c30387e6780e005b110439 /drivers/net/ethernet/8390 | |
| parent | 3066af582fd8084d9767ee8a71b8778360813106 (diff) | |
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>
Diffstat (limited to 'drivers/net/ethernet/8390')
| -rw-r--r-- | drivers/net/ethernet/8390/Kconfig | 9 | ||||
| -rw-r--r-- | drivers/net/ethernet/8390/Makefile | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/net/ethernet/8390/Kconfig b/drivers/net/ethernet/8390/Kconfig index e1219e037c04..880121730cb0 100644 --- a/drivers/net/ethernet/8390/Kconfig +++ b/drivers/net/ethernet/8390/Kconfig | |||
| @@ -6,8 +6,8 @@ config NET_VENDOR_8390 | |||
| 6 | bool "National Semi-conductor 8390 devices" | 6 | bool "National Semi-conductor 8390 devices" |
| 7 | default y | 7 | default y |
| 8 | depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \ | 8 | depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \ |
| 9 | ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \ | 9 | ISA || EISA || MAC || M32R || MACH_TX49XX || \ |
| 10 | MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \ | 10 | H8300 || ARM || MIPS || ZORRO || PCMCIA || \ |
| 11 | EXPERIMENTAL) | 11 | EXPERIMENTAL) |
| 12 | ---help--- | 12 | ---help--- |
| 13 | If you have a network (Ethernet) card belonging to this class, say Y | 13 | If you have a network (Ethernet) card belonging to this class, say Y |
| @@ -188,10 +188,7 @@ config NE2000 | |||
| 188 | 188 | ||
| 189 | If you have a PCI NE2000 card however, say N here and Y to "PCI | 189 | If you have a PCI NE2000 card however, say N here and Y to "PCI |
| 190 | NE2000 and clone support" under "EISA, VLB, PCI and on board | 190 | NE2000 and clone support" under "EISA, VLB, PCI and on board |
| 191 | controllers" below. If you have a NE2000 card and are running on | 191 | controllers" below. |
| 192 | an MCA system (a bus system used on some IBM PS/2 computers and | ||
| 193 | laptops), say N here and Y to "NE/2 (ne2000 MCA version) support", | ||
| 194 | below. | ||
| 195 | 192 | ||
| 196 | To compile this driver as a module, choose M here. The module | 193 | To compile this driver as a module, choose M here. The module |
| 197 | will be called ne. | 194 | will be called ne. |
diff --git a/drivers/net/ethernet/8390/Makefile b/drivers/net/ethernet/8390/Makefile index f43038babf86..8fb462cb9774 100644 --- a/drivers/net/ethernet/8390/Makefile +++ b/drivers/net/ethernet/8390/Makefile | |||
| @@ -16,7 +16,6 @@ obj-$(CONFIG_HYDRA) += hydra.o 8390.o | |||
| 16 | obj-$(CONFIG_LNE390) += lne390.o 8390.o | 16 | obj-$(CONFIG_LNE390) += lne390.o 8390.o |
| 17 | obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o | 17 | obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o |
| 18 | obj-$(CONFIG_NE2000) += ne.o 8390p.o | 18 | obj-$(CONFIG_NE2000) += ne.o 8390p.o |
| 19 | obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o | ||
| 20 | obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o | 19 | obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o |
| 21 | obj-$(CONFIG_NE3210) += ne3210.o 8390.o | 20 | obj-$(CONFIG_NE3210) += ne3210.o 8390.o |
| 22 | obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o | 21 | obj-$(CONFIG_NE_H8300) += ne-h8300.o 8390.o |