diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/3com/Kconfig | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/8390/Kconfig | 9 | ||||
-rw-r--r-- | drivers/net/ethernet/8390/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/fujitsu/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/i825xx/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/Kconfig | 2 |
7 files changed, 12 insertions, 16 deletions
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig index eb56174469a7..8c417ed339b4 100644 --- a/drivers/net/ethernet/3com/Kconfig +++ b/drivers/net/ethernet/3com/Kconfig | |||
@@ -5,7 +5,7 @@ | |||
5 | config NET_VENDOR_3COM | 5 | config NET_VENDOR_3COM |
6 | bool "3Com devices" | 6 | bool "3Com devices" |
7 | default y | 7 | default y |
8 | depends on ISA || EISA || MCA || PCI || PCMCIA | 8 | depends on ISA || EISA || PCI || PCMCIA |
9 | ---help--- | 9 | ---help--- |
10 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y |
11 | and read the Ethernet-HOWTO, available from | 11 | and read the Ethernet-HOWTO, available from |
@@ -33,8 +33,8 @@ config EL1 | |||
33 | will be called 3c501. | 33 | will be called 3c501. |
34 | 34 | ||
35 | config EL3 | 35 | config EL3 |
36 | tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support" | 36 | tristate "3c509/3c579 \"EtherLink III\" support" |
37 | depends on (ISA || EISA || MCA) | 37 | depends on (ISA || EISA) |
38 | ---help--- | 38 | ---help--- |
39 | If you have a network (Ethernet) card belonging to the 3Com | 39 | If you have a network (Ethernet) card belonging to the 3Com |
40 | EtherLinkIII series, say Y and read the Ethernet-HOWTO, available | 40 | 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 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 |
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index 8350f4b37a8a..304613302f01 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig | |||
@@ -7,7 +7,7 @@ config NET_VENDOR_AMD | |||
7 | default y | 7 | default y |
8 | depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ | 8 | depends on DIO || MACH_DECSTATION || MVME147 || ATARI || SUN3 || \ |
9 | SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ | 9 | SUN3X || SBUS || PCI || ZORRO || (ISA && ISA_DMA_API) || \ |
10 | (ARM && ARCH_EBSA110) || ISA || EISA || MCA || PCMCIA | 10 | (ARM && ARCH_EBSA110) || ISA || EISA || PCMCIA |
11 | ---help--- | 11 | ---help--- |
12 | If you have a network (Ethernet) chipset belonging to this class, | 12 | If you have a network (Ethernet) chipset belonging to this class, |
13 | say Y. | 13 | say Y. |
@@ -107,7 +107,7 @@ config DECLANCE | |||
107 | 107 | ||
108 | config DEPCA | 108 | config DEPCA |
109 | tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support" | 109 | tristate "DEPCA, DE10x, DE200, DE201, DE202, DE422 support" |
110 | depends on (ISA || EISA || MCA) | 110 | depends on (ISA || EISA) |
111 | select CRC32 | 111 | select CRC32 |
112 | ---help--- | 112 | ---help--- |
113 | If you have a network (Ethernet) card of this type, say Y and read | 113 | 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 dffee9d44fd5..aca156888fd8 100644 --- a/drivers/net/ethernet/fujitsu/Kconfig +++ b/drivers/net/ethernet/fujitsu/Kconfig | |||
@@ -5,7 +5,7 @@ | |||
5 | config NET_VENDOR_FUJITSU | 5 | config NET_VENDOR_FUJITSU |
6 | bool "Fujitsu devices" | 6 | bool "Fujitsu devices" |
7 | default y | 7 | default y |
8 | depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL) | 8 | depends on ISA || PCMCIA || (ISA && EXPERIMENTAL) |
9 | ---help--- | 9 | ---help--- |
10 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y |
11 | and read the Ethernet-HOWTO, available from | 11 | and read the Ethernet-HOWTO, available from |
@@ -19,7 +19,7 @@ if NET_VENDOR_FUJITSU | |||
19 | 19 | ||
20 | config AT1700 | 20 | config AT1700 |
21 | tristate "AT1700/1720 support (EXPERIMENTAL)" | 21 | tristate "AT1700/1720 support (EXPERIMENTAL)" |
22 | depends on (ISA || MCA_LEGACY) && EXPERIMENTAL | 22 | depends on ISA && EXPERIMENTAL |
23 | select CRC32 | 23 | select CRC32 |
24 | ---help--- | 24 | ---help--- |
25 | If you have a network (Ethernet) card of this type, say Y and read | 25 | 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 959faf7388e2..70f8c2d221b6 100644 --- a/drivers/net/ethernet/i825xx/Kconfig +++ b/drivers/net/ethernet/i825xx/Kconfig | |||
@@ -6,7 +6,7 @@ config NET_VENDOR_I825XX | |||
6 | bool "Intel (82586/82593/82596) devices" | 6 | bool "Intel (82586/82593/82596) devices" |
7 | default y | 7 | default y |
8 | depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ | 8 | depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ |
9 | ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \ | 9 | ARCH_ACORN || SNI_RM || SUN3 || \ |
10 | GSC || BVME6000 || MVME16x || EXPERIMENTAL) | 10 | GSC || BVME6000 || MVME16x || EXPERIMENTAL) |
11 | ---help--- | 11 | ---help--- |
12 | If you have a network (Ethernet) card belonging to this class, say Y | 12 | 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 ddee4060948a..bde4f3db328f 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig | |||
@@ -6,7 +6,7 @@ config NET_VENDOR_INTEL | |||
6 | bool "Intel devices" | 6 | bool "Intel devices" |
7 | default y | 7 | default y |
8 | depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \ | 8 | depends on PCI || PCI_MSI || ISA || ISA_DMA_API || ARM || \ |
9 | ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \ | 9 | ARCH_ACORN || SNI_RM || SUN3 || \ |
10 | GSC || BVME6000 || MVME16x || \ | 10 | GSC || BVME6000 || MVME16x || \ |
11 | (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \ | 11 | (ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR) || \ |
12 | EXPERIMENTAL | 12 | EXPERIMENTAL |