[PATCH] select MII

The patch below switches MII to be select'ed instead of including it in
the Makefile.

Note that this patch requires a recent Linus' tree with the select CRC32
patch included.

diffstat output:

 drivers/net/Kconfig          |   11 +++++++++++
 drivers/net/Makefile         |   28 +++++++++++-----------------
 drivers/net/pcmcia/Kconfig   |    1 +
 drivers/net/tulip/Kconfig    |    1 +
 drivers/usb/net/Kconfig      |    2 ++
 drivers/usb/net/Makefile.mii |    6 ------
 6 files changed, 26 insertions(+), 23 deletions(-)

Tangential to the patch I observed a small problem (not fixed in the patch):
MII depends on NET_ETHERNET, but USB_PEGASUS and USB_USBNET depend
only on NET.

cu
Adrian

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index a1b13141e085942735bf5a1f11323ac0160858a6..64c9f867e78b8af6405881389f1c31c16ab46323 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1210,6 +1210,7 @@ config PCNET32
        tristate "AMD PCnet32 PCI support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          If you have a PCnet32 or PCnetPCI based network (Ethernet) card,
          answer Y here and read the Ethernet-HOWTO, available from
@@ -1223,6 +1224,7 @@ config AMD8111_ETH
        tristate "AMD 8111 (new PCI lance) support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          If you have an AMD 8111-based PCI lance ethernet card,
          answer Y here and read the Ethernet-HOWTO, available from
@@ -1236,6 +1238,7 @@ config ADAPTEC_STARFIRE
        tristate "Adaptec Starfire/DuraLAN support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network
          adapter. The DuraLAN chip is used on the 64 bit PCI boards from
@@ -1330,6 +1333,7 @@ config DGRS
 config EEPRO100
        tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
        depends on NET_PCI && PCI
+       select MII
        help
          If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
          card, say Y and read the Ethernet-HOWTO, available from
@@ -1442,6 +1446,7 @@ config FEALNX
        tristate "Myson MTD-8xx PCI Ethernet support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          Say Y here to support the Mysom MTD-800 family of PCI-based Ethernet
          cards. Specifications and data at
@@ -1509,6 +1514,7 @@ config 8139CP
        tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"
        depends on NET_PCI && PCI && EXPERIMENTAL
        select CRC32
+       select MII
        help
          This is a driver for the Fast Ethernet PCI network cards based on
          the RTL8139C+ chips. If you have one of those, say Y and read
@@ -1522,6 +1528,7 @@ config 8139TOO
        tristate "RealTek RTL-8139 PCI Fast Ethernet Adapter support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        ---help---
          This is a driver for the Fast Ethernet PCI network cards based on
          the RTL8139 chips. If you have one of those, say Y and read
@@ -1594,6 +1601,7 @@ config EPIC100
        tristate "SMC EtherPower II"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          This driver is for the SMC EtherPower II 9432 PCI Ethernet NIC,
          which is based on the SMC83c17x (EPIC/100).
@@ -1604,6 +1612,7 @@ config SUNDANCE
        tristate "Sundance Alta support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          This driver is for the Sundance "Alta" chip.
          More specific information and updates are available from
@@ -1642,6 +1651,7 @@ config VIA_RHINE
        tristate "VIA Rhine support"
        depends on NET_PCI && PCI
        select CRC32
+       select MII
        help
          If you have a VIA "rhine" based network card (Rhine-I (3043) or
          Rhine-2 (VT86c100A)), say Y here.
@@ -1896,6 +1906,7 @@ config NS83820
 config HAMACHI
        tristate "Packet Engines Hamachi GNIC-II support"
        depends on PCI
+       select MII
        help
          If you have a Gigabit Ethernet card of this type, say Y and read
          the Ethernet-HOWTO, available from

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f79f4566028e858c902e9cf487bb0318460fe33b..5d9ecba92163d2c8840f0304e05603a6ea07694b 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -37,10 +37,10 @@ obj-$(CONFIG_RCPCI) += rcpci.o
 obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
-obj-$(CONFIG_PCNET32) += pcnet32.o mii.o
-obj-$(CONFIG_EEPRO100) += eepro100.o mii.o
+obj-$(CONFIG_PCNET32) += pcnet32.o
+obj-$(CONFIG_EEPRO100) += eepro100.o
 obj-$(CONFIG_TLAN) += tlan.o
-obj-$(CONFIG_EPIC100) += epic100.o mii.o
+obj-$(CONFIG_EPIC100) += epic100.o
 obj-$(CONFIG_SIS190) += sis190.o
 obj-$(CONFIG_SIS900) += sis900.o
 obj-$(CONFIG_YELLOWFIN) += yellowfin.o
@@ -49,13 +49,13 @@ obj-$(CONFIG_VETH) += veth.o
 obj-$(CONFIG_NATSEMI) += natsemi.o
 obj-$(CONFIG_NS83820) += ns83820.o
 obj-$(CONFIG_STNIC) += stnic.o 8390.o
-obj-$(CONFIG_FEALNX) += fealnx.o mii.o
+obj-$(CONFIG_FEALNX) += fealnx.o
 obj-$(CONFIG_TIGON3) += tg3.o
 obj-$(CONFIG_TC35815) += tc35815.o
 obj-$(CONFIG_SK98LIN) += sk98lin/
 obj-$(CONFIG_SKFP) += skfp/
-obj-$(CONFIG_VIA_RHINE) += via-rhine.o mii.o
-obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o mii.o
+obj-$(CONFIG_VIA_RHINE) += via-rhine.o
+obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o
 
 #
 # end link order section
@@ -63,9 +63,8 @@ obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o mii.o
 
 obj-$(CONFIG_MII) += mii.o
 
-obj-$(CONFIG_WINBOND_840) += mii.o
-obj-$(CONFIG_SUNDANCE) += sundance.o mii.o
-obj-$(CONFIG_HAMACHI) += hamachi.o mii.o
+obj-$(CONFIG_SUNDANCE) += sundance.o
+obj-$(CONFIG_HAMACHI) += hamachi.o
 obj-$(CONFIG_NET) += Space.o net_init.o loopback.o
 obj-$(CONFIG_SEEQ8005) += seeq8005.o
 obj-$(CONFIG_ETHERTAP) += ethertap.o
@@ -131,8 +130,8 @@ obj-$(CONFIG_EL3) += 3c509.o
 obj-$(CONFIG_3C515) += 3c515.o
 obj-$(CONFIG_EEXPRESS) += eexpress.o
 obj-$(CONFIG_EEXPRESS_PRO) += eepro.o
-obj-$(CONFIG_8139CP) += 8139cp.o mii.o
-obj-$(CONFIG_8139TOO) += 8139too.o mii.o
+obj-$(CONFIG_8139CP) += 8139cp.o
+obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_ZNET) += znet.o
 obj-$(CONFIG_LAN_SAA9730) += saa9730.o
 obj-$(CONFIG_DEPCA) += depca.o
@@ -175,10 +174,7 @@ obj-$(CONFIG_MAC89x0) += mac89x0.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
-obj-$(CONFIG_AMD8111_ETH) += amd8111e.o mii.o
-
-# non-drivers/net drivers who want mii lib
-obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
+obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 
 obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_NET_FC) += fc/
@@ -192,5 +188,3 @@ obj-$(CONFIG_NET_TULIP) += tulip/
 obj-$(CONFIG_HAMRADIO) += hamradio/
 obj-$(CONFIG_IRDA) += irda/
 
-
-include $(TOPDIR)/drivers/usb/net/Makefile.mii

diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index 47b664618cc4e2a7d25bbdea3bfa5bdf722015bd..b1eb28d4497259dc784d21df6b26c651742211ce 100644 (file)
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -77,6 +77,7 @@ config PCMCIA_SMC91C92
        tristate "SMC 91Cxx PCMCIA support"
        depends on NET_PCMCIA && PCMCIA
        select CRC32
+       select MII
        help
          Say Y here if you intend to attach an SMC 91Cxx compatible PCMCIA
          (PC-card) Ethernet or Fast Ethernet card to your computer.

diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 4480f4f74f03441e801646300ccecc1065c5025e..dbd677e22eb812714c43cd18a6839b046fcea84b 100644 (file)
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -89,6 +89,7 @@ config WINBOND_840
        tristate "Winbond W89c840 Ethernet support"
        depends on NET_TULIP && PCI
        select CRC32
+       select MII
        help
          This driver is for the Winbond W89c840 chip.  It also works with 
          the TX9882 chip on the Compex RL100-ATX board.

diff --git a/drivers/usb/net/Kconfig b/drivers/usb/net/Kconfig
index fced240e514d7219e798ee72963c7deb500b4467..822d349923fad8a740d834132d3d3efb44bffbc7 100644 (file)
--- a/drivers/usb/net/Kconfig
+++ b/drivers/usb/net/Kconfig
@@ -70,6 +70,7 @@ config USB_KAWETH
 config USB_PEGASUS
        tristate "USB Pegasus/Pegasus-II based ethernet device support"
        depends on USB && NET
+       select MII
        ---help---
          Say Y here if you know you have Pegasus or Pegasus-II based adapter.
          If in doubt then look at linux/drivers/usb/pegasus.h for the complete
@@ -96,6 +97,7 @@ config USB_USBNET
        tristate "Multi-purpose USB Networking Framework"
        depends on USB && NET
        select CRC32
+       select MII
        ---help---
          This driver supports several kinds of network links over USB,
          with "minidrivers" built around a common network driver core

diff --git a/drivers/usb/net/Makefile.mii b/drivers/usb/net/Makefile.mii
deleted file mode 100644 (file)
index 20cf79a..0000000
--- a/drivers/usb/net/Makefile.mii
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Makefile for USB Network drivers which require generic MII code.
-#
-
-obj-$(CONFIG_USB_PEGASUS)      += mii.o
-obj-$(CONFIG_USB_USBNET)       += mii.o