Commit a1606c7d authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller

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: default avatarBen Hutchings <ben@decadent.org.uk>
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ef71e0c
......@@ -4,7 +4,6 @@ config ETRAX_ETHERNET
bool "Ethernet support"
depends on ETRAX_ARCH_V10
select ETHERNET
select NET_CORE
select MII
help
This option enables the ETRAX 100LX built-in 10/100Mbit Ethernet
......
......@@ -4,7 +4,6 @@ config ETRAX_ETHERNET
bool "Ethernet support"
depends on ETRAX_ARCH_V32
select ETHERNET
select NET_CORE
select MII
help
This option enables the ETRAX FS built-in 10/100Mbit Ethernet
......
......@@ -25,6 +25,9 @@ menuconfig NETDEVICES
# that for each of the symbols.
if NETDEVICES
config MII
tristate
config NET_CORE
default y
bool "Network core driver support"
......@@ -100,13 +103,6 @@ config NET_FC
adaptor below. You also should have said Y to "SCSI support" and
"SCSI generic support".
config MII
tristate "Generic Media Independent Interface device support"
help
Most ethernet controllers have MII transceiver either as an external
or internal device. It is safe to say Y or M here even if your
ethernet card lacks MII.
config IFB
tristate "Intermediate Functional Block support"
depends on NET_CLS_ACT
......
......@@ -67,7 +67,6 @@ config PCMCIA_3C589
config VORTEX
tristate "3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" support"
depends on (PCI || EISA) && HAS_IOPORT
select NET_CORE
select MII
---help---
This option enables driver support for a large number of 10Mbps and
......
......@@ -64,7 +64,6 @@ config JME
tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver supports the PCI-Express gigabit ethernet adapters
......@@ -96,7 +95,6 @@ config FEALNX
tristate "Myson MTD-8xx PCI Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
Say Y here to support the Myson MTD-800 family of PCI-based Ethernet
......@@ -107,7 +105,6 @@ source "drivers/net/ethernet/8390/Kconfig"
config NET_NETX
tristate "NetX Ethernet support"
select NET_CORE
select MII
depends on ARCH_NETX
---help---
......@@ -125,7 +122,6 @@ source "drivers/net/ethernet/oki-semi/Kconfig"
config ETHOC
tristate "OpenCores 10/100 Mbps Ethernet MAC support"
depends on HAS_IOMEM && HAS_DMA
select NET_CORE
select MII
select PHYLIB
select CRC32
......
......@@ -22,7 +22,6 @@ config ADAPTEC_STARFIRE
tristate "Adaptec Starfire/DuraLAN support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
......
......@@ -23,7 +23,6 @@ config BFIN_MAC
tristate "Blackfin on-chip MAC support"
depends on (BF516 || BF518 || BF526 || BF527 || BF536 || BF537)
select CRC32
select NET_CORE
select MII
select PHYLIB
select BFIN_MAC_USE_L1 if DMA_UNCACHED_NONE
......
......@@ -24,7 +24,6 @@ config SUN4I_EMAC
depends on ARCH_SUNXI
depends on OF
select CRC32
select NET_CORE
select MII
select PHYLIB
---help---
......
......@@ -34,7 +34,6 @@ config AMD8111_ETH
tristate "AMD 8111 (new PCI LANCE) support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
If you have an AMD 8111-based PCI LANCE ethernet card,
......@@ -60,7 +59,6 @@ config PCNET32
tristate "AMD PCnet32 PCI support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
......
......@@ -22,7 +22,6 @@ config ATL2
tristate "Atheros L2 Fast Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver supports the Atheros L2 fast ethernet adapter.
......@@ -34,7 +33,6 @@ config ATL1
tristate "Atheros/Attansic L1 Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver supports the Atheros/Attansic L1 gigabit ethernet
......@@ -47,7 +45,6 @@ config ATL1E
tristate "Atheros L1E Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver supports the Atheros L1E gigabit ethernet adapter.
......@@ -59,7 +56,6 @@ config ATL1C
tristate "Atheros L1C Gigabit Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver supports the Atheros L1C gigabit ethernet adapter.
......
......@@ -22,7 +22,6 @@ config B44
tristate "Broadcom 440x/47xx ethernet support"
depends on SSB_POSSIBLE && HAS_DMA
select SSB
select NET_CORE
select MII
---help---
If you have a network (Ethernet) controller of this type, say Y
......@@ -54,7 +53,6 @@ config B44_PCI
config BCM63XX_ENET
tristate "Broadcom 63xx internal mac support"
depends on BCM63XX
select NET_CORE
select MII
select PHYLIB
help
......
......@@ -44,7 +44,6 @@ config CS89x0_PLATFORM
config EP93XX_ETH
tristate "EP93xx Ethernet support"
depends on ARM && ARCH_EP93XX
select NET_CORE
select MII
help
This is a driver for the ethernet hardware included in EP93xx CPUs.
......
......@@ -6,7 +6,6 @@ config DM9000
tristate "DM9000 support"
depends on ARM || BLACKFIN || MIPS || COLDFIRE
select CRC32
select NET_CORE
select MII
---help---
Support for DM9000 chipset.
......
......@@ -126,7 +126,6 @@ config WINBOND_840
tristate "Winbond W89c840 Ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver is for the Winbond W89c840 chip. It also works with
......
......@@ -36,7 +36,6 @@ config SUNDANCE
tristate "Sundance Alta support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver is for the Sundance "Alta" chip.
......
......@@ -21,7 +21,6 @@ if NET_VENDOR_FARADAY
config FTMAC100
tristate "Faraday FTMAC100 10/100 Ethernet support"
depends on ARM
select NET_CORE
select MII
---help---
This driver supports the FTMAC100 10/100 Ethernet controller
......
config FS_ENET
tristate "Freescale Ethernet Driver"
depends on NET_VENDOR_FREESCALE && (CPM1 || CPM2 || PPC_MPC512x)
select NET_CORE
select MII
select PHYLIB
......
......@@ -5,7 +5,6 @@
config IP1000
tristate "IP1000 Gigabit Ethernet support"
depends on PCI
select NET_CORE
select MII
---help---
This driver supports IP1000 gigabit Ethernet cards.
......
......@@ -20,7 +20,6 @@ if NET_VENDOR_INTEL
config E100
tristate "Intel(R) PRO/100+ support"
depends on PCI
select NET_CORE
select MII
---help---
This driver supports Intel(R) PRO/100 family of adapters.
......
......@@ -22,7 +22,6 @@ if NET_VENDOR_MICREL
config ARM_KS8695_ETHER
tristate "KS8695 Ethernet support"
depends on ARM && ARCH_KS8695
select NET_CORE
select MII
---help---
If you wish to compile a kernel for the KS8695 and want to
......@@ -39,7 +38,6 @@ config KS8842
config KS8851
tristate "Micrel KS8851 SPI"
depends on SPI
select NET_CORE
select MII
select CRC32
select EEPROM_93CX6
......@@ -49,7 +47,6 @@ config KS8851
config KS8851_MLL
tristate "Micrel KS8851 MLL"
depends on HAS_IOMEM
select NET_CORE
select MII
---help---
This platform driver is for Micrel KS8851 Address/data bus
......@@ -58,7 +55,6 @@ config KS8851_MLL
config KSZ884X_PCI
tristate "Micrel KSZ8841/2 PCI"
depends on PCI
select NET_CORE
select MII
select CRC32
---help---
......
......@@ -22,7 +22,6 @@ config W90P910_ETH
tristate "Nuvoton w90p910 Ethernet support"
depends on ARM && ARCH_W90X900
select PHYLIB
select NET_CORE
select MII
---help---
Say Y here if you want to use built-in Ethernet ports
......
......@@ -5,7 +5,6 @@
config PCH_GBE
tristate "OKI SEMICONDUCTOR IOH(ML7223/ML7831) GbE"
depends on PCI
select NET_CORE
select MII
select PTP_1588_CLOCK_PCH
---help---
......
......@@ -21,7 +21,6 @@ if NET_PACKET_ENGINE
config HAMACHI
tristate "Packet Engines Hamachi GNIC-II support"
depends on PCI
select NET_CORE
select MII
---help---
If you have a Gigabit Ethernet card of this type, say Y and read
......
......@@ -22,7 +22,6 @@ config R6040
tristate "RDC R6040 Fast Ethernet Adapter support"
depends on PCI
select CRC32
select NET_CORE
select MII
select PHYLIB
---help---
......
......@@ -37,7 +37,6 @@ config 8139CP
tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This is a driver for the Fast Ethernet PCI network cards based on
......@@ -52,7 +51,6 @@ config 8139TOO
tristate "RealTek RTL-8129/8130/8139 PCI Fast Ethernet Adapter support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This is a driver for the Fast Ethernet PCI network cards based on
......@@ -107,7 +105,6 @@ config R8169
depends on PCI
select FW_LOADER
select CRC32
select NET_CORE
select MII
---help---
Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
......
......@@ -5,7 +5,6 @@
config SH_ETH
tristate "Renesas SuperH Ethernet support"
select CRC32
select NET_CORE
select MII
select MDIO_BITBANG
select PHYLIB
......
......@@ -22,7 +22,6 @@ config SGI_IOC3_ETH
bool "SGI IOC3 Ethernet"
depends on PCI && SGI_IP27
select CRC32
select NET_CORE
select MII
---help---
If you have a network (Ethernet) card of this type, say Y and read
......
......@@ -22,7 +22,6 @@ config SIS900
tristate "SiS 900/7016 PCI Fast Ethernet Adapter support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This is a driver for the Fast Ethernet PCI network cards based on
......@@ -39,7 +38,6 @@ config SIS190
tristate "SiS190/SiS191 gigabit ethernet support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or
......
......@@ -37,7 +37,6 @@ config SMC9194
config SMC91X
tristate "SMC 91C9x/91C1xxx support"
select CRC32
select NET_CORE
select MII
depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
MN10300 || COLDFIRE || ARM64)
......@@ -57,7 +56,6 @@ config PCMCIA_SMC91C92
tristate "SMC 91Cxx PCMCIA support"
depends on PCMCIA
select CRC32
select NET_CORE
select MII
---help---
Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
......@@ -70,7 +68,6 @@ config EPIC100
tristate "SMC EtherPower II"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
......@@ -81,7 +78,6 @@ config EPIC100
config SMC911X
tristate "SMSC LAN911[5678] support"
select CRC32
select NET_CORE
select MII
depends on (ARM || SUPERH || MN10300)
---help---
......@@ -99,7 +95,6 @@ config SMSC911X
tristate "SMSC LAN911x/LAN921x families embedded ethernet support"
depends on HAS_IOMEM
select CRC32
select NET_CORE
select MII
select PHYLIB
---help---
......
config STMMAC_ETH
tristate "STMicroelectronics 10/100/1000 Ethernet driver"
depends on HAS_IOMEM && HAS_DMA
select NET_CORE
select MII
select PHYLIB
select CRC32
......
......@@ -21,7 +21,6 @@ config VIA_RHINE
tristate "VIA Rhine support"
depends on PCI
select CRC32
select NET_CORE
select MII
---help---
If you have a VIA "Rhine" based network card (Rhine-I (VT86C100A),
......@@ -47,7 +46,6 @@ config VIA_VELOCITY
depends on (PCI || USE_OF)
select CRC32
select CRC_CCITT
select NET_CORE
select MII
---help---
If you have a VIA "Velocity" based network card say Y here.
......
......@@ -67,7 +67,6 @@ config USB_KAWETH
config USB_PEGASUS
tristate "USB Pegasus/Pegasus-II based ethernet device support"
select NET_CORE
select MII
---help---
Say Y here if you know you have Pegasus or Pegasus-II based adapter.
......@@ -83,7 +82,6 @@ config USB_PEGASUS
config USB_RTL8150
tristate "USB RTL8150 based ethernet device support"
select NET_CORE
select MII
help
Say Y here if you have RTL8150 based usb-ethernet adapter.
......@@ -95,7 +93,6 @@ config USB_RTL8150
config USB_RTL8152
tristate "Realtek RTL8152 Based USB 2.0 Ethernet Adapters"
select NET_CORE
select MII
help
This option adds support for Realtek RTL8152 based USB 2.0
......@@ -106,7 +103,6 @@ config USB_RTL8152
config USB_USBNET
tristate "Multi-purpose USB Networking Framework"
select NET_CORE
select MII
---help---
This driver supports several kinds of network links over USB,
......
......@@ -32,7 +32,6 @@ config BPCTL
depends on PCI && NET
depends on m
select SBYPASS
select NET_CORE
select MII
---help---
If you have a network (Ethernet) controller of this type, say Y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment