diff options
33 files changed, 3 insertions, 61 deletions
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig index 5f2cdb3e428c..8eab0c61d57b 100644 --- a/arch/cris/arch-v10/drivers/Kconfig +++ b/arch/cris/arch-v10/drivers/Kconfig | |||
@@ -4,7 +4,6 @@ config ETRAX_ETHERNET | |||
4 | bool "Ethernet support" | 4 | bool "Ethernet support" |
5 | depends on ETRAX_ARCH_V10 | 5 | depends on ETRAX_ARCH_V10 |
6 | select ETHERNET | 6 | select ETHERNET |
7 | select NET_CORE | ||
8 | select MII | 7 | select MII |
9 | help | 8 | help |
10 | This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet | 9 | This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index c55971a40c34..91c4e54ca904 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -4,7 +4,6 @@ config ETRAX_ETHERNET | |||
4 | bool "Ethernet support" | 4 | bool "Ethernet support" |
5 | depends on ETRAX_ARCH_V32 | 5 | depends on ETRAX_ARCH_V32 |
6 | select ETHERNET | 6 | select ETHERNET |
7 | select NET_CORE | ||
8 | select MII | 7 | select MII |
9 | help | 8 | help |
10 | This option enables the ETRAX FS built-in 10/100Mbit Ethernet | 9 | This option enables the ETRAX FS built-in 10/100Mbit Ethernet |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3835321b8cf3..00aba08f01a9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -25,6 +25,9 @@ menuconfig NETDEVICES | |||
25 | # that for each of the symbols. | 25 | # that for each of the symbols. |
26 | if NETDEVICES | 26 | if NETDEVICES |
27 | 27 | ||
28 | config MII | ||
29 | tristate | ||
30 | |||
28 | config NET_CORE | 31 | config NET_CORE |
29 | default y | 32 | default y |
30 | bool "Network core driver support" | 33 | bool "Network core driver support" |
@@ -100,13 +103,6 @@ config NET_FC | |||
100 | adaptor below. You also should have said Y to "SCSI support" and | 103 | adaptor below. You also should have said Y to "SCSI support" and |
101 | "SCSI generic support". | 104 | "SCSI generic support". |
102 | 105 | ||
103 | config MII | ||
104 | tristate "Generic Media Independent Interface device support" | ||
105 | help | ||
106 | Most ethernet controllers have MII transceiver either as an external | ||
107 | or internal device. It is safe to say Y or M here even if your | ||
108 | ethernet card lacks MII. | ||
109 | |||
110 | config IFB | 106 | config IFB |
111 | tristate "Intermediate Functional Block support" | 107 | tristate "Intermediate Functional Block support" |
112 | depends on NET_CLS_ACT | 108 | depends on NET_CLS_ACT |
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig index 1c71c763f680..f00c76377b44 100644 --- a/drivers/net/ethernet/3com/Kconfig +++ b/drivers/net/ethernet/3com/Kconfig | |||
@@ -67,7 +67,6 @@ config PCMCIA_3C589 | |||
67 | config VORTEX | 67 | config VORTEX |
68 | tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" | 68 | tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support" |
69 | depends on (PCI || EISA) && HAS_IOPORT | 69 | depends on (PCI || EISA) && HAS_IOPORT |
70 | select NET_CORE | ||
71 | select MII | 70 | select MII |
72 | ---help--- | 71 | ---help--- |
73 | This option enables driver support for a large number of 10Mbps and | 72 | This option enables driver support for a large number of 10Mbps and |
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 18fd6fbeb109..a989669b353a 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig | |||
@@ -64,7 +64,6 @@ config JME | |||
64 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" | 64 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" |
65 | depends on PCI | 65 | depends on PCI |
66 | select CRC32 | 66 | select CRC32 |
67 | select NET_CORE | ||
68 | select MII | 67 | select MII |
69 | ---help--- | 68 | ---help--- |
70 | This driver supports the PCI-Express gigabit ethernet adapters | 69 | This driver supports the PCI-Express gigabit ethernet adapters |
@@ -96,7 +95,6 @@ config FEALNX | |||
96 | tristate "Myson MTD-8xx PCI Ethernet support" | 95 | tristate "Myson MTD-8xx PCI Ethernet support" |
97 | depends on PCI | 96 | depends on PCI |
98 | select CRC32 | 97 | select CRC32 |
99 | select NET_CORE | ||
100 | select MII | 98 | select MII |
101 | ---help--- | 99 | ---help--- |
102 | Say Y here to support the Myson MTD-800 family of PCI-based Ethernet | 100 | Say Y here to support the Myson MTD-800 family of PCI-based Ethernet |
@@ -107,7 +105,6 @@ source "drivers/net/ethernet/8390/Kconfig" | |||
107 | 105 | ||
108 | config NET_NETX | 106 | config NET_NETX |
109 | tristate "NetX Ethernet support" | 107 | tristate "NetX Ethernet support" |
110 | select NET_CORE | ||
111 | select MII | 108 | select MII |
112 | depends on ARCH_NETX | 109 | depends on ARCH_NETX |
113 | ---help--- | 110 | ---help--- |
@@ -125,7 +122,6 @@ source "drivers/net/ethernet/oki-semi/Kconfig" | |||
125 | config ETHOC | 122 | config ETHOC |
126 | tristate "OpenCores 10/100 Mbps Ethernet MAC support" | 123 | tristate "OpenCores 10/100 Mbps Ethernet MAC support" |
127 | depends on HAS_IOMEM && HAS_DMA | 124 | depends on HAS_IOMEM && HAS_DMA |
128 | select NET_CORE | ||
129 | select MII | 125 | select MII |
130 | select PHYLIB | 126 | select PHYLIB |
131 | select CRC32 | 127 | select CRC32 |
diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig index 0bff571b1bb3..5c804bbe3dab 100644 --- a/drivers/net/ethernet/adaptec/Kconfig +++ b/drivers/net/ethernet/adaptec/Kconfig | |||
@@ -22,7 +22,6 @@ config ADAPTEC_STARFIRE | |||
22 | tristate "Adaptec Starfire/DuraLAN support" | 22 | tristate "Adaptec Starfire/DuraLAN support" |
23 | depends on PCI | 23 | depends on PCI |
24 | select CRC32 | 24 | select CRC32 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network | 27 | Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network |
diff --git a/drivers/net/ethernet/adi/Kconfig b/drivers/net/ethernet/adi/Kconfig index a9481606bbcd..f952fff6a9a9 100644 --- a/drivers/net/ethernet/adi/Kconfig +++ b/drivers/net/ethernet/adi/Kconfig | |||
@@ -23,7 +23,6 @@ config BFIN_MAC | |||
23 | tristate "Blackfin on-chip MAC support" | 23 | tristate "Blackfin on-chip MAC support" |
24 | depends on (BF516 || BF518 || BF526 || BF527 || BF536 || BF537) | 24 | depends on (BF516 || BF518 || BF526 || BF527 || BF536 || BF537) |
25 | select CRC32 | 25 | select CRC32 |
26 | select NET_CORE | ||
27 | select MII | 26 | select MII |
28 | select PHYLIB | 27 | select PHYLIB |
29 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE | 28 | select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE |
diff --git a/drivers/net/ethernet/allwinner/Kconfig b/drivers/net/ethernet/allwinner/Kconfig index 66d35324f31e..53ad213e865b 100644 --- a/drivers/net/ethernet/allwinner/Kconfig +++ b/drivers/net/ethernet/allwinner/Kconfig | |||
@@ -24,7 +24,6 @@ config SUN4I_EMAC | |||
24 | depends on ARCH_SUNXI | 24 | depends on ARCH_SUNXI |
25 | depends on OF | 25 | depends on OF |
26 | select CRC32 | 26 | select CRC32 |
27 | select NET_CORE | ||
28 | select MII | 27 | select MII |
29 | select PHYLIB | 28 | select PHYLIB |
30 | ---help--- | 29 | ---help--- |
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index 13d74aa4033d..562df46e0a82 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig | |||
@@ -34,7 +34,6 @@ config AMD8111_ETH | |||
34 | tristate "AMD 8111 (new PCI LANCE) support" | 34 | tristate "AMD 8111 (new PCI LANCE) support" |
35 | depends on PCI | 35 | depends on PCI |
36 | select CRC32 | 36 | select CRC32 |
37 | select NET_CORE | ||
38 | select MII | 37 | select MII |
39 | ---help--- | 38 | ---help--- |
40 | If you have an AMD 8111-based PCI LANCE ethernet card, | 39 | If you have an AMD 8111-based PCI LANCE ethernet card, |
@@ -60,7 +59,6 @@ config PCNET32 | |||
60 | tristate "AMD PCnet32 PCI support" | 59 | tristate "AMD PCnet32 PCI support" |
61 | depends on PCI | 60 | depends on PCI |
62 | select CRC32 | 61 | select CRC32 |
63 | select NET_CORE | ||
64 | select MII | 62 | select MII |
65 | ---help--- | 63 | ---help--- |
66 | If you have a PCnet32 or PCnetPCI based network (Ethernet) card, | 64 | If you have a PCnet32 or PCnetPCI based network (Ethernet) card, |
diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig index ad6aa1e98348..39e8d6cc8843 100644 --- a/drivers/net/ethernet/atheros/Kconfig +++ b/drivers/net/ethernet/atheros/Kconfig | |||
@@ -22,7 +22,6 @@ config ATL2 | |||
22 | tristate "Atheros L2 Fast Ethernet support" | 22 | tristate "Atheros L2 Fast Ethernet support" |
23 | depends on PCI | 23 | depends on PCI |
24 | select CRC32 | 24 | select CRC32 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | This driver supports the Atheros L2 fast ethernet adapter. | 27 | This driver supports the Atheros L2 fast ethernet adapter. |
@@ -34,7 +33,6 @@ config ATL1 | |||
34 | tristate "Atheros/Attansic L1 Gigabit Ethernet support" | 33 | tristate "Atheros/Attansic L1 Gigabit Ethernet support" |
35 | depends on PCI | 34 | depends on PCI |
36 | select CRC32 | 35 | select CRC32 |
37 | select NET_CORE | ||
38 | select MII | 36 | select MII |
39 | ---help--- | 37 | ---help--- |
40 | This driver supports the Atheros/Attansic L1 gigabit ethernet | 38 | This driver supports the Atheros/Attansic L1 gigabit ethernet |
@@ -47,7 +45,6 @@ config ATL1E | |||
47 | tristate "Atheros L1E Gigabit Ethernet support" | 45 | tristate "Atheros L1E Gigabit Ethernet support" |
48 | depends on PCI | 46 | depends on PCI |
49 | select CRC32 | 47 | select CRC32 |
50 | select NET_CORE | ||
51 | select MII | 48 | select MII |
52 | ---help--- | 49 | ---help--- |
53 | This driver supports the Atheros L1E gigabit ethernet adapter. | 50 | This driver supports the Atheros L1E gigabit ethernet adapter. |
@@ -59,7 +56,6 @@ config ATL1C | |||
59 | tristate "Atheros L1C Gigabit Ethernet support" | 56 | tristate "Atheros L1C Gigabit Ethernet support" |
60 | depends on PCI | 57 | depends on PCI |
61 | select CRC32 | 58 | select CRC32 |
62 | select NET_CORE | ||
63 | select MII | 59 | select MII |
64 | ---help--- | 60 | ---help--- |
65 | This driver supports the Atheros L1C gigabit ethernet adapter. | 61 | This driver supports the Atheros L1C gigabit ethernet adapter. |
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig index 3e69b3f88099..1d680baf43d6 100644 --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig | |||
@@ -22,7 +22,6 @@ config B44 | |||
22 | tristate "Broadcom 440x/47xx ethernet support" | 22 | tristate "Broadcom 440x/47xx ethernet support" |
23 | depends on SSB_POSSIBLE && HAS_DMA | 23 | depends on SSB_POSSIBLE && HAS_DMA |
24 | select SSB | 24 | select SSB |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | If you have a network (Ethernet) controller of this type, say Y | 27 | If you have a network (Ethernet) controller of this type, say Y |
@@ -54,7 +53,6 @@ config B44_PCI | |||
54 | config BCM63XX_ENET | 53 | config BCM63XX_ENET |
55 | tristate "Broadcom 63xx internal mac support" | 54 | tristate "Broadcom 63xx internal mac support" |
56 | depends on BCM63XX | 55 | depends on BCM63XX |
57 | select NET_CORE | ||
58 | select MII | 56 | select MII |
59 | select PHYLIB | 57 | select PHYLIB |
60 | help | 58 | help |
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig index 8388e36cf08f..7403dff8f14a 100644 --- a/drivers/net/ethernet/cirrus/Kconfig +++ b/drivers/net/ethernet/cirrus/Kconfig | |||
@@ -44,7 +44,6 @@ config CS89x0_PLATFORM | |||
44 | config EP93XX_ETH | 44 | config EP93XX_ETH |
45 | tristate "EP93xx Ethernet support" | 45 | tristate "EP93xx Ethernet support" |
46 | depends on ARM && ARCH_EP93XX | 46 | depends on ARM && ARCH_EP93XX |
47 | select NET_CORE | ||
48 | select MII | 47 | select MII |
49 | help | 48 | help |
50 | This is a driver for the ethernet hardware included in EP93xx CPUs. | 49 | This is a driver for the ethernet hardware included in EP93xx CPUs. |
diff --git a/drivers/net/ethernet/davicom/Kconfig b/drivers/net/ethernet/davicom/Kconfig index 9745fe5e8039..316c5e5a92ad 100644 --- a/drivers/net/ethernet/davicom/Kconfig +++ b/drivers/net/ethernet/davicom/Kconfig | |||
@@ -6,7 +6,6 @@ config DM9000 | |||
6 | tristate "DM9000 support" | 6 | tristate "DM9000 support" |
7 | depends on ARM || BLACKFIN || MIPS || COLDFIRE | 7 | depends on ARM || BLACKFIN || MIPS || COLDFIRE |
8 | select CRC32 | 8 | select CRC32 |
9 | select NET_CORE | ||
10 | select MII | 9 | select MII |
11 | ---help--- | 10 | ---help--- |
12 | Support for DM9000 chipset. | 11 | Support for DM9000 chipset. |
diff --git a/drivers/net/ethernet/dec/tulip/Kconfig b/drivers/net/ethernet/dec/tulip/Kconfig index 1df33c799c00..eb9ba6e97d04 100644 --- a/drivers/net/ethernet/dec/tulip/Kconfig +++ b/drivers/net/ethernet/dec/tulip/Kconfig | |||
@@ -126,7 +126,6 @@ config WINBOND_840 | |||
126 | tristate "Winbond W89c840 Ethernet support" | 126 | tristate "Winbond W89c840 Ethernet support" |
127 | depends on PCI | 127 | depends on PCI |
128 | select CRC32 | 128 | select CRC32 |
129 | select NET_CORE | ||
130 | select MII | 129 | select MII |
131 | ---help--- | 130 | ---help--- |
132 | This driver is for the Winbond W89c840 chip. It also works with | 131 | This driver is for the Winbond W89c840 chip. It also works with |
diff --git a/drivers/net/ethernet/dlink/Kconfig b/drivers/net/ethernet/dlink/Kconfig index ee26ce78e270..c543ac11ce08 100644 --- a/drivers/net/ethernet/dlink/Kconfig +++ b/drivers/net/ethernet/dlink/Kconfig | |||
@@ -36,7 +36,6 @@ config SUNDANCE | |||
36 | tristate "Sundance Alta support" | 36 | tristate "Sundance Alta support" |
37 | depends on PCI | 37 | depends on PCI |
38 | select CRC32 | 38 | select CRC32 |
39 | select NET_CORE | ||
40 | select MII | 39 | select MII |
41 | ---help--- | 40 | ---help--- |
42 | This driver is for the Sundance "Alta" chip. | 41 | This driver is for the Sundance "Alta" chip. |
diff --git a/drivers/net/ethernet/faraday/Kconfig b/drivers/net/ethernet/faraday/Kconfig index b8974b9e3b47..5918c6891694 100644 --- a/drivers/net/ethernet/faraday/Kconfig +++ b/drivers/net/ethernet/faraday/Kconfig | |||
@@ -21,7 +21,6 @@ if NET_VENDOR_FARADAY | |||
21 | config FTMAC100 | 21 | config FTMAC100 |
22 | tristate "Faraday FTMAC100 10/100 Ethernet support" | 22 | tristate "Faraday FTMAC100 10/100 Ethernet support" |
23 | depends on ARM | 23 | depends on ARM |
24 | select NET_CORE | ||
25 | select MII | 24 | select MII |
26 | ---help--- | 25 | ---help--- |
27 | This driver supports the FTMAC100 10/100 Ethernet controller | 26 | This driver supports the FTMAC100 10/100 Ethernet controller |
diff --git a/drivers/net/ethernet/freescale/fs_enet/Kconfig b/drivers/net/ethernet/freescale/fs_enet/Kconfig index 268414d9f2cb..be92229f2c2a 100644 --- a/drivers/net/ethernet/freescale/fs_enet/Kconfig +++ b/drivers/net/ethernet/freescale/fs_enet/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config FS_ENET | 1 | config FS_ENET |
2 | tristate "Freescale Ethernet Driver" | 2 | tristate "Freescale Ethernet Driver" |
3 | depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x) | 3 | depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x) |
4 | select NET_CORE | ||
5 | select MII | 4 | select MII |
6 | select PHYLIB | 5 | select PHYLIB |
7 | 6 | ||
diff --git a/drivers/net/ethernet/icplus/Kconfig b/drivers/net/ethernet/icplus/Kconfig index 5119ef18953b..14a66e9d2e26 100644 --- a/drivers/net/ethernet/icplus/Kconfig +++ b/drivers/net/ethernet/icplus/Kconfig | |||
@@ -5,7 +5,6 @@ | |||
5 | config IP1000 | 5 | config IP1000 |
6 | tristate "IP1000 Gigabit Ethernet support" | 6 | tristate "IP1000 Gigabit Ethernet support" |
7 | depends on PCI | 7 | depends on PCI |
8 | select NET_CORE | ||
9 | select MII | 8 | select MII |
10 | ---help--- | 9 | ---help--- |
11 | This driver supports IP1000 gigabit Ethernet cards. | 10 | This driver supports IP1000 gigabit Ethernet cards. |
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig index 05f7264c51f7..f0e7ed20a750 100644 --- a/drivers/net/ethernet/intel/Kconfig +++ b/drivers/net/ethernet/intel/Kconfig | |||
@@ -20,7 +20,6 @@ if NET_VENDOR_INTEL | |||
20 | config E100 | 20 | config E100 |
21 | tristate "Intel(R) PRO/100+ support" | 21 | tristate "Intel(R) PRO/100+ support" |
22 | depends on PCI | 22 | depends on PCI |
23 | select NET_CORE | ||
24 | select MII | 23 | select MII |
25 | ---help--- | 24 | ---help--- |
26 | This driver supports Intel(R) PRO/100 family of adapters. | 25 | This driver supports Intel(R) PRO/100 family of adapters. |
diff --git a/drivers/net/ethernet/micrel/Kconfig b/drivers/net/ethernet/micrel/Kconfig index fe42fc00d8d3..d16b11ed2e52 100644 --- a/drivers/net/ethernet/micrel/Kconfig +++ b/drivers/net/ethernet/micrel/Kconfig | |||
@@ -22,7 +22,6 @@ if NET_VENDOR_MICREL | |||
22 | config ARM_KS8695_ETHER | 22 | config ARM_KS8695_ETHER |
23 | tristate "KS8695 Ethernet support" | 23 | tristate "KS8695 Ethernet support" |
24 | depends on ARM && ARCH_KS8695 | 24 | depends on ARM && ARCH_KS8695 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | If you wish to compile a kernel for the KS8695 and want to | 27 | If you wish to compile a kernel for the KS8695 and want to |
@@ -39,7 +38,6 @@ config KS8842 | |||
39 | config KS8851 | 38 | config KS8851 |
40 | tristate "Micrel KS8851 SPI" | 39 | tristate "Micrel KS8851 SPI" |
41 | depends on SPI | 40 | depends on SPI |
42 | select NET_CORE | ||
43 | select MII | 41 | select MII |
44 | select CRC32 | 42 | select CRC32 |
45 | select EEPROM_93CX6 | 43 | select EEPROM_93CX6 |
@@ -49,7 +47,6 @@ config KS8851 | |||
49 | config KS8851_MLL | 47 | config KS8851_MLL |
50 | tristate "Micrel KS8851 MLL" | 48 | tristate "Micrel KS8851 MLL" |
51 | depends on HAS_IOMEM | 49 | depends on HAS_IOMEM |
52 | select NET_CORE | ||
53 | select MII | 50 | select MII |
54 | ---help--- | 51 | ---help--- |
55 | This platform driver is for Micrel KS8851 Address/data bus | 52 | This platform driver is for Micrel KS8851 Address/data bus |
@@ -58,7 +55,6 @@ config KS8851_MLL | |||
58 | config KSZ884X_PCI | 55 | config KSZ884X_PCI |
59 | tristate "Micrel KSZ8841/2 PCI" | 56 | tristate "Micrel KSZ8841/2 PCI" |
60 | depends on PCI | 57 | depends on PCI |
61 | select NET_CORE | ||
62 | select MII | 58 | select MII |
63 | select CRC32 | 59 | select CRC32 |
64 | ---help--- | 60 | ---help--- |
diff --git a/drivers/net/ethernet/nuvoton/Kconfig b/drivers/net/ethernet/nuvoton/Kconfig index 334c17183095..01182b559473 100644 --- a/drivers/net/ethernet/nuvoton/Kconfig +++ b/drivers/net/ethernet/nuvoton/Kconfig | |||
@@ -22,7 +22,6 @@ config W90P910_ETH | |||
22 | tristate "Nuvoton w90p910 Ethernet support" | 22 | tristate "Nuvoton w90p910 Ethernet support" |
23 | depends on ARM && ARCH_W90X900 | 23 | depends on ARM && ARCH_W90X900 |
24 | select PHYLIB | 24 | select PHYLIB |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | Say Y here if you want to use built-in Ethernet ports | 27 | Say Y here if you want to use built-in Ethernet ports |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig index 34d05bf72b2e..cb22341a14a8 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig +++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | |||
@@ -5,7 +5,6 @@ | |||
5 | config PCH_GBE | 5 | config PCH_GBE |
6 | tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE" | 6 | tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE" |
7 | depends on PCI | 7 | depends on PCI |
8 | select NET_CORE | ||
9 | select MII | 8 | select MII |
10 | select PTP_1588_CLOCK_PCH | 9 | select PTP_1588_CLOCK_PCH |
11 | ---help--- | 10 | ---help--- |
diff --git a/drivers/net/ethernet/packetengines/Kconfig b/drivers/net/ethernet/packetengines/Kconfig index cbbeca3f8c5c..8d5180043c70 100644 --- a/drivers/net/ethernet/packetengines/Kconfig +++ b/drivers/net/ethernet/packetengines/Kconfig | |||
@@ -21,7 +21,6 @@ if NET_PACKET_ENGINE | |||
21 | config HAMACHI | 21 | config HAMACHI |
22 | tristate "Packet Engines Hamachi GNIC-II support" | 22 | tristate "Packet Engines Hamachi GNIC-II support" |
23 | depends on PCI | 23 | depends on PCI |
24 | select NET_CORE | ||
25 | select MII | 24 | select MII |
26 | ---help--- | 25 | ---help--- |
27 | If you have a Gigabit Ethernet card of this type, say Y and read | 26 | If you have a Gigabit Ethernet card of this type, say Y and read |
diff --git a/drivers/net/ethernet/rdc/Kconfig b/drivers/net/ethernet/rdc/Kconfig index c8ba4b3494c1..2055f7eb2ba9 100644 --- a/drivers/net/ethernet/rdc/Kconfig +++ b/drivers/net/ethernet/rdc/Kconfig | |||
@@ -22,7 +22,6 @@ config R6040 | |||
22 | tristate "RDC R6040 Fast Ethernet Adapter support" | 22 | tristate "RDC R6040 Fast Ethernet Adapter support" |
23 | depends on PCI | 23 | depends on PCI |
24 | select CRC32 | 24 | select CRC32 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | select PHYLIB | 26 | select PHYLIB |
28 | ---help--- | 27 | ---help--- |
diff --git a/drivers/net/ethernet/realtek/Kconfig b/drivers/net/ethernet/realtek/Kconfig index 783fa8b5cde7..ae5d027096ed 100644 --- a/drivers/net/ethernet/realtek/Kconfig +++ b/drivers/net/ethernet/realtek/Kconfig | |||
@@ -37,7 +37,6 @@ config 8139CP | |||
37 | tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support" | 37 | tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support" |
38 | depends on PCI | 38 | depends on PCI |
39 | select CRC32 | 39 | select CRC32 |
40 | select NET_CORE | ||
41 | select MII | 40 | select MII |
42 | ---help--- | 41 | ---help--- |
43 | This is a driver for the Fast Ethernet PCI network cards based on | 42 | This is a driver for the Fast Ethernet PCI network cards based on |
@@ -52,7 +51,6 @@ config 8139TOO | |||
52 | tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support" | 51 | tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support" |
53 | depends on PCI | 52 | depends on PCI |
54 | select CRC32 | 53 | select CRC32 |
55 | select NET_CORE | ||
56 | select MII | 54 | select MII |
57 | ---help--- | 55 | ---help--- |
58 | This is a driver for the Fast Ethernet PCI network cards based on | 56 | This is a driver for the Fast Ethernet PCI network cards based on |
@@ -107,7 +105,6 @@ config R8169 | |||
107 | depends on PCI | 105 | depends on PCI |
108 | select FW_LOADER | 106 | select FW_LOADER |
109 | select CRC32 | 107 | select CRC32 |
110 | select NET_CORE | ||
111 | select MII | 108 | select MII |
112 | ---help--- | 109 | ---help--- |
113 | Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. | 110 | Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. |
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig index 267eac054fa4..544514e66187 100644 --- a/drivers/net/ethernet/renesas/Kconfig +++ b/drivers/net/ethernet/renesas/Kconfig | |||
@@ -5,7 +5,6 @@ | |||
5 | config SH_ETH | 5 | config SH_ETH |
6 | tristate "Renesas SuperH Ethernet support" | 6 | tristate "Renesas SuperH Ethernet support" |
7 | select CRC32 | 7 | select CRC32 |
8 | select NET_CORE | ||
9 | select MII | 8 | select MII |
10 | select MDIO_BITBANG | 9 | select MDIO_BITBANG |
11 | select PHYLIB | 10 | select PHYLIB |
diff --git a/drivers/net/ethernet/sgi/Kconfig b/drivers/net/ethernet/sgi/Kconfig index c1c4bb868a3b..e832f46660c9 100644 --- a/drivers/net/ethernet/sgi/Kconfig +++ b/drivers/net/ethernet/sgi/Kconfig | |||
@@ -22,7 +22,6 @@ config SGI_IOC3_ETH | |||
22 | bool "SGI IOC3 Ethernet" | 22 | bool "SGI IOC3 Ethernet" |
23 | depends on PCI && SGI_IP27 | 23 | depends on PCI && SGI_IP27 |
24 | select CRC32 | 24 | select CRC32 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | If you have a network (Ethernet) card of this type, say Y and read | 27 | If you have a network (Ethernet) card of this type, say Y and read |
diff --git a/drivers/net/ethernet/sis/Kconfig b/drivers/net/ethernet/sis/Kconfig index f1135cc1bd48..68d052b09af1 100644 --- a/drivers/net/ethernet/sis/Kconfig +++ b/drivers/net/ethernet/sis/Kconfig | |||
@@ -22,7 +22,6 @@ config SIS900 | |||
22 | tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" | 22 | tristate "SiS 900/7016 PCI Fast Ethernet Adapter support" |
23 | depends on PCI | 23 | depends on PCI |
24 | select CRC32 | 24 | select CRC32 |
25 | select NET_CORE | ||
26 | select MII | 25 | select MII |
27 | ---help--- | 26 | ---help--- |
28 | This is a driver for the Fast Ethernet PCI network cards based on | 27 | This is a driver for the Fast Ethernet PCI network cards based on |
@@ -39,7 +38,6 @@ config SIS190 | |||
39 | tristate "SiS190/SiS191 gigabit ethernet support" | 38 | tristate "SiS190/SiS191 gigabit ethernet support" |
40 | depends on PCI | 39 | depends on PCI |
41 | select CRC32 | 40 | select CRC32 |
42 | select NET_CORE | ||
43 | select MII | 41 | select MII |
44 | ---help--- | 42 | ---help--- |
45 | Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or | 43 | Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or |
diff --git a/drivers/net/ethernet/smsc/Kconfig b/drivers/net/ethernet/smsc/Kconfig index ff9e99474039..068fc44d37e1 100644 --- a/drivers/net/ethernet/smsc/Kconfig +++ b/drivers/net/ethernet/smsc/Kconfig | |||
@@ -37,7 +37,6 @@ config SMC9194 | |||
37 | config SMC91X | 37 | config SMC91X |
38 | tristate "SMC 91C9x/91C1xxx support" | 38 | tristate "SMC 91C9x/91C1xxx support" |
39 | select CRC32 | 39 | select CRC32 |
40 | select NET_CORE | ||
41 | select MII | 40 | select MII |
42 | depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \ | 41 | depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \ |
43 | MN10300 || COLDFIRE || ARM64) | 42 | MN10300 || COLDFIRE || ARM64) |
@@ -57,7 +56,6 @@ config PCMCIA_SMC91C92 | |||
57 | tristate "SMC 91Cxx PCMCIA support" | 56 | tristate "SMC 91Cxx PCMCIA support" |
58 | depends on PCMCIA | 57 | depends on PCMCIA |
59 | select CRC32 | 58 | select CRC32 |
60 | select NET_CORE | ||
61 | select MII | 59 | select MII |
62 | ---help--- | 60 | ---help--- |
63 | Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA | 61 | Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA |
@@ -70,7 +68,6 @@ config EPIC100 | |||
70 | tristate "SMC EtherPower II" | 68 | tristate "SMC EtherPower II" |
71 | depends on PCI | 69 | depends on PCI |
72 | select CRC32 | 70 | select CRC32 |
73 | select NET_CORE | ||
74 | select MII | 71 | select MII |
75 | ---help--- | 72 | ---help--- |
76 | This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC, | 73 | This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC, |
@@ -81,7 +78,6 @@ config EPIC100 | |||
81 | config SMC911X | 78 | config SMC911X |
82 | tristate "SMSC LAN911[5678] support" | 79 | tristate "SMSC LAN911[5678] support" |
83 | select CRC32 | 80 | select CRC32 |
84 | select NET_CORE | ||
85 | select MII | 81 | select MII |
86 | depends on (ARM || SUPERH || MN10300) | 82 | depends on (ARM || SUPERH || MN10300) |
87 | ---help--- | 83 | ---help--- |
@@ -99,7 +95,6 @@ config SMSC911X | |||
99 | tristate "SMSC LAN911x/LAN921x families embedded ethernet support" | 95 | tristate "SMSC LAN911x/LAN921x families embedded ethernet support" |
100 | depends on HAS_IOMEM | 96 | depends on HAS_IOMEM |
101 | select CRC32 | 97 | select CRC32 |
102 | select NET_CORE | ||
103 | select MII | 98 | select MII |
104 | select PHYLIB | 99 | select PHYLIB |
105 | ---help--- | 100 | ---help--- |
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index 43c1f3223322..6e52c0f74cd9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | config STMMAC_ETH | 1 | config STMMAC_ETH |
2 | tristate "STMicroelectronics 10/100/1000 Ethernet driver" | 2 | tristate "STMicroelectronics 10/100/1000 Ethernet driver" |
3 | depends on HAS_IOMEM && HAS_DMA | 3 | depends on HAS_IOMEM && HAS_DMA |
4 | select NET_CORE | ||
5 | select MII | 4 | select MII |
6 | select PHYLIB | 5 | select PHYLIB |
7 | select CRC32 | 6 | select CRC32 |
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig index 6a87097d88c0..8a049a2b4474 100644 --- a/drivers/net/ethernet/via/Kconfig +++ b/drivers/net/ethernet/via/Kconfig | |||
@@ -21,7 +21,6 @@ config VIA_RHINE | |||
21 | tristate "VIA Rhine support" | 21 | tristate "VIA Rhine support" |
22 | depends on PCI | 22 | depends on PCI |
23 | select CRC32 | 23 | select CRC32 |
24 | select NET_CORE | ||
25 | select MII | 24 | select MII |
26 | ---help--- | 25 | ---help--- |
27 | If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A), | 26 | If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A), |
@@ -47,7 +46,6 @@ config VIA_VELOCITY | |||
47 | depends on (PCI || USE_OF) | 46 | depends on (PCI || USE_OF) |
48 | select CRC32 | 47 | select CRC32 |
49 | select CRC_CCITT | 48 | select CRC_CCITT |
50 | select NET_CORE | ||
51 | select MII | 49 | select MII |
52 | ---help--- | 50 | ---help--- |
53 | If you have a VIA "Velocity" based network card say Y here. | 51 | If you have a VIA "Velocity" based network card say Y here. |
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig index 287cc624b90b..d84bfd4109a4 100644 --- a/drivers/net/usb/Kconfig +++ b/drivers/net/usb/Kconfig | |||
@@ -67,7 +67,6 @@ config USB_KAWETH | |||
67 | 67 | ||
68 | config USB_PEGASUS | 68 | config USB_PEGASUS |
69 | tristate "USB Pegasus/Pegasus-II based ethernet device support" | 69 | tristate "USB Pegasus/Pegasus-II based ethernet device support" |
70 | select NET_CORE | ||
71 | select MII | 70 | select MII |
72 | ---help--- | 71 | ---help--- |
73 | Say Y here if you know you have Pegasus or Pegasus-II based adapter. | 72 | Say Y here if you know you have Pegasus or Pegasus-II based adapter. |
@@ -83,7 +82,6 @@ config USB_PEGASUS | |||
83 | 82 | ||
84 | config USB_RTL8150 | 83 | config USB_RTL8150 |
85 | tristate "USB RTL8150 based ethernet device support" | 84 | tristate "USB RTL8150 based ethernet device support" |
86 | select NET_CORE | ||
87 | select MII | 85 | select MII |
88 | help | 86 | help |
89 | Say Y here if you have RTL8150 based usb-ethernet adapter. | 87 | Say Y here if you have RTL8150 based usb-ethernet adapter. |
@@ -95,7 +93,6 @@ config USB_RTL8150 | |||
95 | 93 | ||
96 | config USB_RTL8152 | 94 | config USB_RTL8152 |
97 | tristate "Realtek RTL8152 Based USB 2.0 Ethernet Adapters" | 95 | tristate "Realtek RTL8152 Based USB 2.0 Ethernet Adapters" |
98 | select NET_CORE | ||
99 | select MII | 96 | select MII |
100 | help | 97 | help |
101 | This option adds support for Realtek RTL8152 based USB 2.0 | 98 | This option adds support for Realtek RTL8152 based USB 2.0 |
@@ -106,7 +103,6 @@ config USB_RTL8152 | |||
106 | 103 | ||
107 | config USB_USBNET | 104 | config USB_USBNET |
108 | tristate "Multi-purpose USB Networking Framework" | 105 | tristate "Multi-purpose USB Networking Framework" |
109 | select NET_CORE | ||
110 | select MII | 106 | select MII |
111 | ---help--- | 107 | ---help--- |
112 | This driver supports several kinds of network links over USB, | 108 | This driver supports several kinds of network links over USB, |
diff --git a/drivers/staging/silicom/Kconfig b/drivers/staging/silicom/Kconfig index eda2e7d73645..fc082db628ec 100644 --- a/drivers/staging/silicom/Kconfig +++ b/drivers/staging/silicom/Kconfig | |||
@@ -32,7 +32,6 @@ config BPCTL | |||
32 | depends on PCI && NET | 32 | depends on PCI && NET |
33 | depends on m | 33 | depends on m |
34 | select SBYPASS | 34 | select SBYPASS |
35 | select NET_CORE | ||
36 | select MII | 35 | select MII |
37 | ---help--- | 36 | ---help--- |
38 | If you have a network (Ethernet) controller of this type, say Y | 37 | If you have a network (Ethernet) controller of this type, say Y |