Skip to content

Commit a1606c7

Browse files
bwhacksdavem330
bwhacks
authored and
davem330
committed
net: Move MII out from under NET_CORE and hide it
All drivers that select MII also need to select NET_CORE because MII depends on it. This is a bit ridiculous because NET_CORE is just a menu option that doesn't enable any code by itself. There is also no need for it to be a visible option, since its users all select it. Signed-off-by: Ben Hutchings <[email protected]> Acked-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9ef71e0 commit a1606c7

File tree

33 files changed

+3
-61
lines changed

33 files changed

+3
-61
lines changed

‎arch/cris/arch-v10/drivers/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ config ETRAX_ETHERNET
44
bool "Ethernet support"
55
depends on ETRAX_ARCH_V10
66
select ETHERNET
7-
select NET_CORE
87
select MII
98
help
109
This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet

‎arch/cris/arch-v32/drivers/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ config ETRAX_ETHERNET
44
bool "Ethernet support"
55
depends on ETRAX_ARCH_V32
66
select ETHERNET
7-
select NET_CORE
87
select MII
98
help
109
This option enables the ETRAX FS built-in 10/100Mbit Ethernet

‎drivers/net/Kconfig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ menuconfig NETDEVICES
2525
# that for each of the symbols.
2626
if NETDEVICES
2727

28+
config MII
29+
tristate
30+
2831
config NET_CORE
2932
default y
3033
bool "Network core driver support"
@@ -100,13 +103,6 @@ config NET_FC
100103
adaptor below. You also should have said Y to "SCSI support" and
101104
"SCSI generic support".
102105

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-
110106
config IFB
111107
tristate "Intermediate Functional Block support"
112108
depends on NET_CLS_ACT

‎drivers/net/ethernet/3com/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ config PCMCIA_3C589
6767
config VORTEX
6868
tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
6969
depends on (PCI || EISA) && HAS_IOPORT
70-
select NET_CORE
7170
select MII
7271
---help---
7372
This option enables driver support for a large number of 10Mbps and

‎drivers/net/ethernet/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ config JME
6464
tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
6565
depends on PCI
6666
select CRC32
67-
select NET_CORE
6867
select MII
6968
---help---
7069
This driver supports the PCI-Express gigabit ethernet adapters
@@ -96,7 +95,6 @@ config FEALNX
9695
tristate "Myson MTD-8xx PCI Ethernet support"
9796
depends on PCI
9897
select CRC32
99-
select NET_CORE
10098
select MII
10199
---help---
102100
Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
@@ -107,7 +105,6 @@ source "drivers/net/ethernet/8390/Kconfig"
107105

108106
config NET_NETX
109107
tristate "NetX Ethernet support"
110-
select NET_CORE
111108
select MII
112109
depends on ARCH_NETX
113110
---help---
@@ -125,7 +122,6 @@ source "drivers/net/ethernet/oki-semi/Kconfig"
125122
config ETHOC
126123
tristate "OpenCores 10/100 Mbps Ethernet MAC support"
127124
depends on HAS_IOMEM && HAS_DMA
128-
select NET_CORE
129125
select MII
130126
select PHYLIB
131127
select CRC32

‎drivers/net/ethernet/adaptec/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config ADAPTEC_STARFIRE
2222
tristate "Adaptec Starfire/DuraLAN support"
2323
depends on PCI
2424
select CRC32
25-
select NET_CORE
2625
select MII
2726
---help---
2827
Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network

‎drivers/net/ethernet/adi/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ config BFIN_MAC
2323
tristate "Blackfin on-chip MAC support"
2424
depends on (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
2525
select CRC32
26-
select NET_CORE
2726
select MII
2827
select PHYLIB
2928
select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE

‎drivers/net/ethernet/allwinner/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ config SUN4I_EMAC
2424
depends on ARCH_SUNXI
2525
depends on OF
2626
select CRC32
27-
select NET_CORE
2827
select MII
2928
select PHYLIB
3029
---help---

‎drivers/net/ethernet/amd/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ config AMD8111_ETH
3434
tristate "AMD 8111 (new PCI LANCE) support"
3535
depends on PCI
3636
select CRC32
37-
select NET_CORE
3837
select MII
3938
---help---
4039
If you have an AMD 8111-based PCI LANCE ethernet card,
@@ -60,7 +59,6 @@ config PCNET32
6059
tristate "AMD PCnet32 PCI support"
6160
depends on PCI
6261
select CRC32
63-
select NET_CORE
6462
select MII
6563
---help---
6664
If you have a PCnet32 or PCnetPCI based network (Ethernet) card,

‎drivers/net/ethernet/atheros/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config ATL2
2222
tristate "Atheros L2 Fast Ethernet support"
2323
depends on PCI
2424
select CRC32
25-
select NET_CORE
2625
select MII
2726
---help---
2827
This driver supports the Atheros L2 fast ethernet adapter.
@@ -34,7 +33,6 @@ config ATL1
3433
tristate "Atheros/Attansic L1 Gigabit Ethernet support"
3534
depends on PCI
3635
select CRC32
37-
select NET_CORE
3836
select MII
3937
---help---
4038
This driver supports the Atheros/Attansic L1 gigabit ethernet
@@ -47,7 +45,6 @@ config ATL1E
4745
tristate "Atheros L1E Gigabit Ethernet support"
4846
depends on PCI
4947
select CRC32
50-
select NET_CORE
5148
select MII
5249
---help---
5350
This driver supports the Atheros L1E gigabit ethernet adapter.
@@ -59,7 +56,6 @@ config ATL1C
5956
tristate "Atheros L1C Gigabit Ethernet support"
6057
depends on PCI
6158
select CRC32
62-
select NET_CORE
6359
select MII
6460
---help---
6561
This driver supports the Atheros L1C gigabit ethernet adapter.

‎drivers/net/ethernet/broadcom/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config B44
2222
tristate "Broadcom 440x/47xx ethernet support"
2323
depends on SSB_POSSIBLE && HAS_DMA
2424
select SSB
25-
select NET_CORE
2625
select MII
2726
---help---
2827
If you have a network (Ethernet) controller of this type, say Y
@@ -54,7 +53,6 @@ config B44_PCI
5453
config BCM63XX_ENET
5554
tristate "Broadcom 63xx internal mac support"
5655
depends on BCM63XX
57-
select NET_CORE
5856
select MII
5957
select PHYLIB
6058
help

‎drivers/net/ethernet/cirrus/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ config CS89x0_PLATFORM
4444
config EP93XX_ETH
4545
tristate "EP93xx Ethernet support"
4646
depends on ARM && ARCH_EP93XX
47-
select NET_CORE
4847
select MII
4948
help
5049
This is a driver for the ethernet hardware included in EP93xx CPUs.

‎drivers/net/ethernet/davicom/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config DM9000
66
tristate "DM9000 support"
77
depends on ARM || BLACKFIN || MIPS || COLDFIRE
88
select CRC32
9-
select NET_CORE
109
select MII
1110
---help---
1211
Support for DM9000 chipset.

‎drivers/net/ethernet/dec/tulip/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ config WINBOND_840
126126
tristate "Winbond W89c840 Ethernet support"
127127
depends on PCI
128128
select CRC32
129-
select NET_CORE
130129
select MII
131130
---help---
132131
This driver is for the Winbond W89c840 chip. It also works with

‎drivers/net/ethernet/dlink/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ config SUNDANCE
3636
tristate "Sundance Alta support"
3737
depends on PCI
3838
select CRC32
39-
select NET_CORE
4039
select MII
4140
---help---
4241
This driver is for the Sundance "Alta" chip.

‎drivers/net/ethernet/faraday/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ if NET_VENDOR_FARADAY
2121
config FTMAC100
2222
tristate "Faraday FTMAC100 10/100 Ethernet support"
2323
depends on ARM
24-
select NET_CORE
2524
select MII
2625
---help---
2726
This driver supports the FTMAC100 10/100 Ethernet controller

‎drivers/net/ethernet/freescale/fs_enet/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
config FS_ENET
22
tristate "Freescale Ethernet Driver"
33
depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
4-
select NET_CORE
54
select MII
65
select PHYLIB
76

‎drivers/net/ethernet/icplus/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
config IP1000
66
tristate "IP1000 Gigabit Ethernet support"
77
depends on PCI
8-
select NET_CORE
98
select MII
109
---help---
1110
This driver supports IP1000 gigabit Ethernet cards.

‎drivers/net/ethernet/intel/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ if NET_VENDOR_INTEL
2020
config E100
2121
tristate "Intel(R) PRO/100+ support"
2222
depends on PCI
23-
select NET_CORE
2423
select MII
2524
---help---
2625
This driver supports Intel(R) PRO/100 family of adapters.

‎drivers/net/ethernet/micrel/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ if NET_VENDOR_MICREL
2222
config ARM_KS8695_ETHER
2323
tristate "KS8695 Ethernet support"
2424
depends on ARM && ARCH_KS8695
25-
select NET_CORE
2625
select MII
2726
---help---
2827
If you wish to compile a kernel for the KS8695 and want to
@@ -39,7 +38,6 @@ config KS8842
3938
config KS8851
4039
tristate "Micrel KS8851 SPI"
4140
depends on SPI
42-
select NET_CORE
4341
select MII
4442
select CRC32
4543
select EEPROM_93CX6
@@ -49,7 +47,6 @@ config KS8851
4947
config KS8851_MLL
5048
tristate "Micrel KS8851 MLL"
5149
depends on HAS_IOMEM
52-
select NET_CORE
5350
select MII
5451
---help---
5552
This platform driver is for Micrel KS8851 Address/data bus
@@ -58,7 +55,6 @@ config KS8851_MLL
5855
config KSZ884X_PCI
5956
tristate "Micrel KSZ8841/2 PCI"
6057
depends on PCI
61-
select NET_CORE
6258
select MII
6359
select CRC32
6460
---help---

‎drivers/net/ethernet/nuvoton/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config W90P910_ETH
2222
tristate "Nuvoton w90p910 Ethernet support"
2323
depends on ARM && ARCH_W90X900
2424
select PHYLIB
25-
select NET_CORE
2625
select MII
2726
---help---
2827
Say Y here if you want to use built-in Ethernet ports

‎drivers/net/ethernet/oki-semi/pch_gbe/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
config PCH_GBE
66
tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
77
depends on PCI
8-
select NET_CORE
98
select MII
109
select PTP_1588_CLOCK_PCH
1110
---help---

‎drivers/net/ethernet/packetengines/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ if NET_PACKET_ENGINE
2121
config HAMACHI
2222
tristate "Packet Engines Hamachi GNIC-II support"
2323
depends on PCI
24-
select NET_CORE
2524
select MII
2625
---help---
2726
If you have a Gigabit Ethernet card of this type, say Y and read

‎drivers/net/ethernet/rdc/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config R6040
2222
tristate "RDC R6040 Fast Ethernet Adapter support"
2323
depends on PCI
2424
select CRC32
25-
select NET_CORE
2625
select MII
2726
select PHYLIB
2827
---help---

‎drivers/net/ethernet/realtek/Kconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ config 8139CP
3737
tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support"
3838
depends on PCI
3939
select CRC32
40-
select NET_CORE
4140
select MII
4241
---help---
4342
This is a driver for the Fast Ethernet PCI network cards based on
@@ -52,7 +51,6 @@ config 8139TOO
5251
tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
5352
depends on PCI
5453
select CRC32
55-
select NET_CORE
5654
select MII
5755
---help---
5856
This is a driver for the Fast Ethernet PCI network cards based on
@@ -107,7 +105,6 @@ config R8169
107105
depends on PCI
108106
select FW_LOADER
109107
select CRC32
110-
select NET_CORE
111108
select MII
112109
---help---
113110
Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.

‎drivers/net/ethernet/renesas/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
config SH_ETH
66
tristate "Renesas SuperH Ethernet support"
77
select CRC32
8-
select NET_CORE
98
select MII
109
select MDIO_BITBANG
1110
select PHYLIB

‎drivers/net/ethernet/sgi/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config SGI_IOC3_ETH
2222
bool "SGI IOC3 Ethernet"
2323
depends on PCI && SGI_IP27
2424
select CRC32
25-
select NET_CORE
2625
select MII
2726
---help---
2827
If you have a network (Ethernet) card of this type, say Y and read

‎drivers/net/ethernet/sis/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ config SIS900
2222
tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
2323
depends on PCI
2424
select CRC32
25-
select NET_CORE
2625
select MII
2726
---help---
2827
This is a driver for the Fast Ethernet PCI network cards based on
@@ -39,7 +38,6 @@ config SIS190
3938
tristate "SiS190/SiS191 gigabit ethernet support"
4039
depends on PCI
4140
select CRC32
42-
select NET_CORE
4341
select MII
4442
---help---
4543
Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or

‎drivers/net/ethernet/smsc/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ config SMC9194
3737
config SMC91X
3838
tristate "SMC 91C9x/91C1xxx support"
3939
select CRC32
40-
select NET_CORE
4140
select MII
4241
depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
4342
MN10300 || COLDFIRE || ARM64)
@@ -57,7 +56,6 @@ config PCMCIA_SMC91C92
5756
tristate "SMC 91Cxx PCMCIA support"
5857
depends on PCMCIA
5958
select CRC32
60-
select NET_CORE
6159
select MII
6260
---help---
6361
Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
@@ -70,7 +68,6 @@ config EPIC100
7068
tristate "SMC EtherPower II"
7169
depends on PCI
7270
select CRC32
73-
select NET_CORE
7471
select MII
7572
---help---
7673
This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
@@ -81,7 +78,6 @@ config EPIC100
8178
config SMC911X
8279
tristate "SMSC LAN911[5678] support"
8380
select CRC32
84-
select NET_CORE
8581
select MII
8682
depends on (ARM || SUPERH || MN10300)
8783
---help---
@@ -99,7 +95,6 @@ config SMSC911X
9995
tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
10096
depends on HAS_IOMEM
10197
select CRC32
102-
select NET_CORE
10398
select MII
10499
select PHYLIB
105100
---help---

‎drivers/net/ethernet/stmicro/stmmac/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
config STMMAC_ETH
22
tristate "STMicroelectronics 10/100/1000 Ethernet driver"
33
depends on HAS_IOMEM && HAS_DMA
4-
select NET_CORE
54
select MII
65
select PHYLIB
76
select CRC32

0 commit comments

Comments
 (0)