- Express hard dependencies on bus (pci, isa, pccard) and

  network layer (ether).
- Don't abuse module names to facilitate ifconfig module loading;
  such abuse isn't really needed.  (And if we do need type information
  associated with a module then we should make it explicit and not
  use hacks.)

86 files changed, 223 insertions, 92 deletions

diff --git a/sys/dev/agp/agp_ali.c b/sys/dev/agp/agp_ali.c
index fc8004c4d1b0..f89d14be7753 100644
--- a/sys/dev/agp/agp_ali.c
+++ b/sys/dev/agp/agp_ali.c
@@ -264,3 +264,5 @@ static driver_t agp_ali_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_ali, pci, agp_ali_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_ali, agp, 1, 1, 1);
+MODULE_DEPEND(agp_ali, pci, 1, 1, 1);
diff --git a/sys/dev/agp/agp_amd.c b/sys/dev/agp/agp_amd.c
index 7c4d0ef22801..24e3cc9a15fb 100644
--- a/sys/dev/agp/agp_amd.c
+++ b/sys/dev/agp/agp_amd.c
@@ -417,3 +417,5 @@ static driver_t agp_amd_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_amd, pci, agp_amd_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_amd, agp, 1, 1, 1);
+MODULE_DEPEND(agp_amd, pci, 1, 1, 1);
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 39890ac4cd64..29acc1b42460 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -701,3 +701,5 @@ static driver_t agp_i810_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
+MODULE_DEPEND(agp_i810, pci, 1, 1, 1);
diff --git a/sys/dev/agp/agp_intel.c b/sys/dev/agp/agp_intel.c
index 6441fd9aa557..c1d933a1227f 100644
--- a/sys/dev/agp/agp_intel.c
+++ b/sys/dev/agp/agp_intel.c
@@ -378,3 +378,5 @@ static driver_t agp_intel_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_intel, pci, agp_intel_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_intel, agp, 1, 1, 1);
+MODULE_DEPEND(agp_intel, pci, 1, 1, 1);
diff --git a/sys/dev/agp/agp_sis.c b/sys/dev/agp/agp_sis.c
index 36145440c240..00cb991b126f 100644
--- a/sys/dev/agp/agp_sis.c
+++ b/sys/dev/agp/agp_sis.c
@@ -258,3 +258,5 @@ static driver_t agp_sis_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_sis, pci, agp_sis_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_sis, agp, 1, 1, 1);
+MODULE_DEPEND(agp_sis, pci, 1, 1, 1);
diff --git a/sys/dev/agp/agp_via.c b/sys/dev/agp/agp_via.c
index fabebeb6dd1d..4d13230db422 100644
--- a/sys/dev/agp/agp_via.c
+++ b/sys/dev/agp/agp_via.c
@@ -255,3 +255,5 @@ static driver_t agp_via_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_via, pci, agp_via_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_via, agp, 1, 1, 1);
+MODULE_DEPEND(agp_via, pci, 1, 1, 1);
diff --git a/sys/dev/an/if_an_isa.c b/sys/dev/an/if_an_isa.c
index 0dd709a2e474..f4ee9be714eb 100644
--- a/sys/dev/an/if_an_isa.c
+++ b/sys/dev/an/if_an_isa.c
@@ -166,5 +166,6 @@ static driver_t an_isa_driver = {
 
 static devclass_t an_isa_devclass;
 
-DRIVER_MODULE(if_an, isa, an_isa_driver, an_isa_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, isa, an_isa_driver, an_isa_devclass, 0, 0);
+MODULE_DEPEND(an, isa, 1, 1, 1);
+MODULE_DEPEND(an, wlan, 1, 1, 1);
diff --git a/sys/dev/an/if_an_pccard.c b/sys/dev/an/if_an_pccard.c
index 36b263b7991b..0b3bc337c142 100644
--- a/sys/dev/an/if_an_pccard.c
+++ b/sys/dev/an/if_an_pccard.c
@@ -105,8 +105,9 @@ static driver_t an_pccard_driver = {
 
 static devclass_t an_pccard_devclass;
 
-DRIVER_MODULE(if_an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, pccard, an_pccard_driver, an_pccard_devclass, 0, 0);
+MODULE_DEPEND(an, wlan, 1, 1, 1);
+MODULE_DEPEND(an, pccard, 1, 1, 1);
 
 static const struct pccard_product an_pccard_products[] = {
 	PCMCIA_CARD(AIRONET, PC4800, 0),
diff --git a/sys/dev/an/if_an_pci.c b/sys/dev/an/if_an_pci.c
index 2969daa25295..eba74db54be9 100644
--- a/sys/dev/an/if_an_pci.c
+++ b/sys/dev/an/if_an_pci.c
@@ -297,5 +297,6 @@ static driver_t an_pci_driver = {
 
 static devclass_t an_devclass;
 
-DRIVER_MODULE(if_an, pci, an_pci_driver, an_devclass, 0, 0);
-MODULE_DEPEND(if_an, wlan, 1, 1, 1);
+DRIVER_MODULE(an, pci, an_pci_driver, an_devclass, 0, 0);
+MODULE_DEPEND(an, pci, 1, 1, 1);
+MODULE_DEPEND(an, wlan, 1, 1, 1);
diff --git a/sys/dev/ar/if_ar_isa.c b/sys/dev/ar/if_ar_isa.c
index d52535952af8..f4fed809983a 100644
--- a/sys/dev/ar/if_ar_isa.c
+++ b/sys/dev/ar/if_ar_isa.c
@@ -90,7 +90,8 @@ static driver_t ar_isa_driver = {
 	sizeof (struct ar_hardc)
 };
 
-DRIVER_MODULE(if_ar, isa, ar_isa_driver, ar_devclass, 0, 0);
+DRIVER_MODULE(ar, isa, ar_isa_driver, ar_devclass, 0, 0);
+MODULE_DEPEND(ar, isa, 1, 1, 1);
 
 /*
  * Probe to see if it is there.
diff --git a/sys/dev/ar/if_ar_pci.c b/sys/dev/ar/if_ar_pci.c
index d14b416ef4f4..314e859f5078 100644
--- a/sys/dev/ar/if_ar_pci.c
+++ b/sys/dev/ar/if_ar_pci.c
@@ -71,7 +71,8 @@ static driver_t ar_pci_driver = {
 	sizeof(struct ar_hardc),
 };
 
-DRIVER_MODULE(if_ar, pci, ar_pci_driver, ar_devclass, 0, 0);
+DRIVER_MODULE(ar, pci, ar_pci_driver, ar_devclass, 0, 0);
+MODULE_DEPEND(ar, pci, 1, 1, 1);
 
 static int
 ar_pci_probe(device_t device)
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 4eafc685213f..aa89e7037dc6 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -111,6 +111,8 @@ __FBSDID("$FreeBSD$");
 
 #define BGE_CSUM_FEATURES	(CSUM_IP | CSUM_TCP | CSUM_UDP)
 
+MODULE_DEPEND(bge, pci, 1, 1, 1);
+MODULE_DEPEND(bge, ether, 1, 1, 1);
 MODULE_DEPEND(bge, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -241,7 +243,7 @@ static driver_t bge_driver = {
 
 static devclass_t bge_devclass;
 
-DRIVER_MODULE(if_bge, pci, bge_driver, bge_devclass, 0, 0);
+DRIVER_MODULE(bge, pci, bge_driver, bge_devclass, 0, 0);
 DRIVER_MODULE(miibus, bge, miibus_driver, miibus_devclass, 0, 0);
 
 static u_int32_t
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index 0ad9e4ea9303..cd0c6793a558 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -132,4 +132,5 @@ static driver_t cm_isa_driver = {
 	sizeof(struct cm_softc)
 };
 
-DRIVER_MODULE(if_cm, isa, cm_isa_driver, cm_devclass, 0, 0);
+DRIVER_MODULE(cm, isa, cm_isa_driver, cm_devclass, 0, 0);
+MODULE_DEPEND(cm, isa, 1, 1, 1);
diff --git a/sys/dev/cnw/if_cnw.c b/sys/dev/cnw/if_cnw.c
index f89038162434..fb200d7540c0 100644
--- a/sys/dev/cnw/if_cnw.c
+++ b/sys/dev/cnw/if_cnw.c
@@ -337,7 +337,8 @@ static driver_t cnw_pccard_driver = {
 
 static devclass_t cnw_pccard_devclass;
 
-DRIVER_MODULE(if_cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0);
+DRIVER_MODULE(cnw, pccard, cnw_pccard_driver, cnw_pccard_devclass, 0, 0);
+MODULE_DEPEND(cnw, ether, 1, 1, 1);
 
 #endif /* !defined(__FreeBSD__) */
 
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 1f0dfbf34b88..df7b0d775cdc 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -126,4 +126,6 @@ static driver_t cs_isa_driver = {
 
 extern devclass_t cs_devclass;
 
-DRIVER_MODULE(if_cs, isa, cs_isa_driver, cs_devclass, 0, 0);
+DRIVER_MODULE(cs, isa, cs_isa_driver, cs_devclass, 0, 0);
+MODULE_DEPEND(cs, isa, 1, 1, 1);
+MODULE_DEPEND(cs, ether, 1, 1, 1);
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 9ec044b38d5e..3aa28f8185a2 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -123,5 +123,6 @@ static driver_t cs_pccard_driver = {
 
 extern devclass_t cs_devclass;
 
-DRIVER_MODULE(if_cs, pccard, cs_pccard_driver, cs_devclass, 0, 0);
-MODULE_DEPEND(if_cs, pccard, 1, 1, 1);
+DRIVER_MODULE(cs, pccard, cs_pccard_driver, cs_devclass, 0, 0);
+MODULE_DEPEND(cs, pccard, 1, 1, 1);
+MODULE_DEPEND(cs, ether, 1, 1, 1);
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 72cb9612cf10..303f2905d676 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -88,6 +88,7 @@ static driver_t cy_pci_driver = {
 static devclass_t	cy_devclass;
 
 DRIVER_MODULE(cy, pci, cy_pci_driver, cy_devclass, 0, 0);
+MODULE_DEPEND(cy, pci, 1, 1, 1);
 
 static int
 cy_pci_probe(dev)
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 240bdba6b4ec..86fd9d595a12 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -131,6 +131,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_dcreg.h>
 
+MODULE_DEPEND(dc, pci, 1, 1, 1);
+MODULE_DEPEND(dc, ether, 1, 1, 1);
 MODULE_DEPEND(dc, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -306,8 +308,8 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
 	&dc_quick,0,"do not mdevget in dc driver");
 #endif
 
-DRIVER_MODULE(if_dc, cardbus, dc_driver, dc_devclass, 0, 0);
-DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
 DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
 
 #define DC_SETBIT(sc, reg, x)				\
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 44de0806d195..e6d5892c6756 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -5259,4 +5259,4 @@ static driver_t tulip_pci_driver = {
     sizeof(tulip_softc_t),
 };
 static devclass_t tulip_devclass;
-DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
+DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 624c2dab3359..9676bcb46835 100644
--- a/sys/dev/ed/if_ed_cbus.c
+++ b/sys/dev/ed/if_ed_cbus.c
@@ -1753,4 +1753,6 @@ static driver_t ed_isa_driver = {
 	sizeof(struct ed_softc)
 };
 
-DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0);
+DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0);
+MODULE_DEPEND(ed, isa, 1, 1, 1);
+MODULE_DEPEND(ed, ether, 1, 1, 1);
diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
index b8339181e705..fd3e081b4d6c 100644
--- a/sys/dev/ed/if_ed_isa.c
+++ b/sys/dev/ed/if_ed_isa.c
@@ -152,4 +152,6 @@ static driver_t ed_isa_driver = {
 	sizeof(struct ed_softc)
 };
 
-DRIVER_MODULE(if_ed, isa, ed_isa_driver, ed_devclass, 0, 0);
+DRIVER_MODULE(ed, isa, ed_isa_driver, ed_devclass, 0, 0);
+MODULE_DEPEND(ed, isa, 1, 1, 1);
+MODULE_DEPEND(ed, ether, 1, 1, 1);
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 15f76fd94764..f7e563f9b727 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -64,6 +64,8 @@
 
 MODULE_DEPEND(ed, miibus, 1, 1, 1);
 #endif
+MODULE_DEPEND(ed, ether, 1, 1, 1);
+MODULE_DEPEND(ed, pccard, 1, 1, 1);
 
 /*
  *      PC-Card (PCMCIA) specific code.
@@ -525,7 +527,7 @@ static driver_t ed_pccard_driver = {
 	sizeof(struct ed_softc)
 };
 
-DRIVER_MODULE(if_ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
+DRIVER_MODULE(ed, pccard, ed_pccard_driver, ed_devclass, 0, 0);
 #ifndef ED_NO_MIIBUS
 DRIVER_MODULE(miibus, ed, miibus_driver, miibus_devclass, 0, 0);
 #endif
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index a283b6e6f25a..ee8067b654e7 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -120,4 +120,6 @@ static driver_t ed_pci_driver = {
 	sizeof(struct ed_softc),
 };
 
-DRIVER_MODULE(if_ed, pci, ed_pci_driver, ed_devclass, 0, 0);
+DRIVER_MODULE(ed, pci, ed_pci_driver, ed_devclass, 0, 0);
+MODULE_DEPEND(ed, pci, 1, 1, 1);
+MODULE_DEPEND(ed, ether, 1, 1, 1);
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 7554120c259f..11fac10796ba 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -174,7 +174,9 @@ static driver_t em_driver = {
 };
 
 static devclass_t em_devclass;
-DRIVER_MODULE(if_em, pci, em_driver, em_devclass, 0, 0);
+DRIVER_MODULE(em, pci, em_driver, em_devclass, 0, 0);
+MODULE_DEPEND(em, pci, 1, 1, 1);
+MODULE_DEPEND(em, ether, 1, 1, 1);
 
 /*********************************************************************
  *  Device identification routine
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 4b99da71cccb..68d0d651c909 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -481,5 +481,5 @@ static driver_t en_driver = {
 
 static devclass_t en_devclass;
 
-DRIVER_MODULE(if_en, pci, en_driver, en_devclass, 0, 0);
+DRIVER_MODULE(en, pci, en_driver, en_devclass, 0, 0);
 
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 11dce81aaf60..2f54addd49e7 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -684,6 +684,6 @@ static driver_t fwe_driver = {
 };
 
 
-DRIVER_MODULE(if_fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
-MODULE_VERSION(if_fwe, 1);
-MODULE_DEPEND(if_fwe, firewire, 1, 1, 1);
+DRIVER_MODULE(fwe, firewire, fwe_driver, fwe_devclass, 0, 0);
+MODULE_VERSION(fwe, 1);
+MODULE_DEPEND(fwe, firewire, 1, 1, 1);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 036e1672b2d0..c84c29a7a8ed 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -79,6 +79,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/fxp/if_fxpvar.h>
 #include <dev/fxp/rcvbundl.h>
 
+MODULE_DEPEND(fxp, pci, 1, 1, 1);
+MODULE_DEPEND(fxp, ether, 1, 1, 1);
 MODULE_DEPEND(fxp, miibus, 1, 1, 1);
 #include "miibus_if.h"
 
@@ -251,8 +253,8 @@ static driver_t fxp_driver = {
 
 static devclass_t fxp_devclass;
 
-DRIVER_MODULE(if_fxp, pci, fxp_driver, fxp_devclass, 0, 0);
-DRIVER_MODULE(if_fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
+DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
+DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
 DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
 
 static int fxp_rnr;
diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c
index 30aa02bc4f1f..7c8146ae0a66 100644
--- a/sys/dev/gem/if_gem_pci.c
+++ b/sys/dev/gem/if_gem_pci.c
@@ -110,7 +110,9 @@ static driver_t gem_pci_driver = {
 };
 
 
-DRIVER_MODULE(if_gem, pci, gem_pci_driver, gem_devclass, 0, 0);
+DRIVER_MODULE(gem, pci, gem_pci_driver, gem_devclass, 0, 0);
+MODULE_DEPEND(gem, pci, 1, 1, 1);
+MODULE_DEPEND(gem, ether, 1, 1, 1);
 
 struct gem_pci_dev {
 	u_int32_t	gpd_devid;
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 8d59cd682705..a9c3433b7329 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -72,6 +72,8 @@
 #include <dev/gx/if_gxreg.h>
 #include <dev/gx/if_gxvar.h>
 
+MODULE_DEPEND(gx, pci, 1, 1, 1);
+MODULE_DEPEND(gx, ether, 1, 1, 1);
 MODULE_DEPEND(gx, miibus, 1, 1, 1);
 #include "miibus_if.h"
 
@@ -196,7 +198,7 @@ static driver_t gx_driver = {
 
 static devclass_t gx_devclass;
 
-DRIVER_MODULE(if_gx, pci, gx_driver, gx_devclass, 0, 0);
+DRIVER_MODULE(gx, pci, gx_driver, gx_devclass, 0, 0);
 DRIVER_MODULE(miibus, gx, miibus_driver, miibus_devclass, 0, 0);
 
 static struct gx_device *
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index 80ae96683d45..5c06c613696d 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -109,7 +109,9 @@ static driver_t hme_pci_driver = {
 	sizeof(struct hme_pci_softc)
 };
 
-DRIVER_MODULE(if_hme, pci, hme_pci_driver, hme_devclass, 0, 0);
+DRIVER_MODULE(hme, pci, hme_pci_driver, hme_devclass, 0, 0);
+MODULE_DEPEND(hme, pci, 1, 1, 1);
+MODULE_DEPEND(hme, ether, 1, 1, 1);
 
 int
 hme_pci_probe(device_t dev)
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 66456fe8b378..782c41ffb13a 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -124,7 +124,8 @@ static driver_t hme_sbus_driver = {
 	sizeof(struct hme_sbus_softc)
 };
 
-DRIVER_MODULE(if_hme, sbus, hme_sbus_driver, hme_devclass, 0, 0);
+DRIVER_MODULE(hme, sbus, hme_sbus_driver, hme_devclass, 0, 0);
+MODULE_DEPEND(hme, ether, 1, 1, 1);
 
 static int
 hme_sbus_probe(device_t dev)
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 202044030715..18a22af156ab 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -189,8 +189,11 @@ static driver_t lge_driver = {
 
 static devclass_t lge_devclass;
 
-DRIVER_MODULE(if_lge, pci, lge_driver, lge_devclass, 0, 0);
+DRIVER_MODULE(lge, pci, lge_driver, lge_devclass, 0, 0);
 DRIVER_MODULE(miibus, lge, miibus_driver, miibus_devclass, 0, 0);
+MODULE_DEPEND(lge, pci, 1, 1, 1);
+MODULE_DEPEND(lge, ether, 1, 1, 1);
+MODULE_DEPEND(lge, miibus, 1, 1, 1);
 
 #define LGE_SETBIT(sc, reg, x)				\
 	CSR_WRITE_4(sc, reg,				\
diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index 571407e46cc4..5fae93e8f098 100644
--- a/sys/dev/lnc/if_lnc_cbus.c
+++ b/sys/dev/lnc/if_lnc_cbus.c
@@ -312,4 +312,6 @@ static driver_t lnc_isa_driver = {
 	sizeof(struct lnc_softc),
 };
 
-DRIVER_MODULE(if_lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
+DRIVER_MODULE(lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
+MODULE_DEPEND(lnc, isa, 1, 1, 1);
+MODULE_DEPEND(lnc, ether, 1, 1, 1);
diff --git a/sys/dev/lnc/if_lnc_isa.c b/sys/dev/lnc/if_lnc_isa.c
index 949ea7dc13fe..cd643b301aa3 100644
--- a/sys/dev/lnc/if_lnc_isa.c
+++ b/sys/dev/lnc/if_lnc_isa.c
@@ -283,4 +283,6 @@ static driver_t lnc_isa_driver = {
 	sizeof(struct lnc_softc),
 };
 
-DRIVER_MODULE(if_lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
+DRIVER_MODULE(lnc, isa, lnc_isa_driver, lnc_devclass, 0, 0);
+MODULE_DEPEND(lnc, isa, 1, 1, 1);
+MODULE_DEPEND(lnc, ether, 1, 1, 1);
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 5a6bd8d7343f..c129e2e6b2ba 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -220,4 +220,6 @@ static driver_t lnc_pci_driver = {
 	sizeof(struct lnc_softc),
 };
 
-DRIVER_MODULE(if_lnc, pci, lnc_pci_driver, lnc_devclass, 0, 0);
+DRIVER_MODULE(lnc, pci, lnc_pci_driver, lnc_devclass, 0, 0);
+MODULE_DEPEND(lnc, pci, 1, 1, 1);
+MODULE_DEPEND(lnc, ether, 1, 1, 1);
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index 9529996381a8..98dfbed71e31 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -171,7 +171,9 @@ static driver_t my_driver = {
 
 static devclass_t my_devclass;
 
-DRIVER_MODULE(if_my, pci, my_driver, my_devclass, 0, 0);
+DRIVER_MODULE(my, pci, my_driver, my_devclass, 0, 0);
+MODULE_DEPEND(my, pci, 1, 1, 1);
+MODULE_DEPEND(my, ether, 1, 1, 1);
 
 static long
 my_send_cmd_to_phy(struct my_softc * sc, int opcode, int regad)
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index e463c52d0478..0c30ab287dbc 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -126,6 +126,8 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/nge/if_ngereg.h>
 
+MODULE_DEPEND(nge, pci, 1, 1, 1);
+MODULE_DEPEND(nge, ether, 1, 1, 1);
 MODULE_DEPEND(nge, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -222,7 +224,7 @@ static driver_t nge_driver = {
 
 static devclass_t nge_devclass;
 
-DRIVER_MODULE(if_nge, pci, nge_driver, nge_devclass, 0, 0);
+DRIVER_MODULE(nge, pci, nge_driver, nge_devclass, 0, 0);
 DRIVER_MODULE(miibus, nge, miibus_driver, miibus_devclass, 0, 0);
 
 #define NGE_SETBIT(sc, reg, x)				\
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index 1245d6128525..b2bc05ab40e6 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -293,6 +293,6 @@ static driver_t pdq_eisa_driver = {
 	sizeof(pdq_softc_t),
 };
 
-DRIVER_MODULE(if_fea, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
-/* MODULE_DEPEND(if_fea, eisa, 1, 1, 1); */
-MODULE_DEPEND(if_fea, fddi, 1, 1, 1);
+DRIVER_MODULE(fea, eisa, pdq_eisa_driver, pdq_devclass, 0, 0);
+/* MODULE_DEPEND(fea, eisa, 1, 1, 1); */
+MODULE_DEPEND(fea, fddi, 1, 1, 1);
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 8137722b5ad0..a8941fff6525 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -231,6 +231,6 @@ static driver_t pdq_pci_driver = {
     sizeof(pdq_softc_t),
 };
 
-DRIVER_MODULE(if_fpa, pci, pdq_pci_driver, pdq_devclass, 0, 0);
-/* MODULE_DEPEND(if_fpa, pci, 1, 1, 1); */
-MODULE_DEPEND(if_fpa, fddi, 1, 1, 1);
+DRIVER_MODULE(fpa, pci, pdq_pci_driver, pdq_devclass, 0, 0);
+MODULE_DEPEND(fpa, pci, 1, 1, 1);
+MODULE_DEPEND(fpa, fddi, 1, 1, 1);
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 11d630b32e91..8c157314319f 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -69,8 +69,8 @@ static struct isa_pnp_id  sbni_ids[] = {
 	{ 0, NULL }	/* we have no pnp sbni cards atm.  */
 };
 
-DRIVER_MODULE(if_sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
-
+DRIVER_MODULE(sbni, isa, sbni_isa_driver, sbni_isa_devclass, 0, 0);
+MODULE_DEPEND(sbni, isa, 1, 1, 1);
 
 static int
 sbni_probe_isa(device_t dev)
diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
index 8665ae05539c..2e5ae18a82d0 100644
--- a/sys/dev/sbni/if_sbni_pci.c
+++ b/sys/dev/sbni/if_sbni_pci.c
@@ -67,8 +67,8 @@ static driver_t sbni_pci_driver = {
 
 static devclass_t sbni_pci_devclass;
 
-DRIVER_MODULE(if_sbni, pci, sbni_pci_driver, sbni_pci_devclass, 0, 0);
-
+DRIVER_MODULE(sbni, pci, sbni_pci_driver, sbni_pci_devclass, 0, 0);
+MODULE_DEPEND(sbni, pci, 1, 1, 1);
 
 static int
 sbni_pci_probe(device_t dev)
diff --git a/sys/dev/sbsh/if_sbsh.c b/sys/dev/sbsh/if_sbsh.c
index 1387b786a122..18efe1d53812 100644
--- a/sys/dev/sbsh/if_sbsh.c
+++ b/sys/dev/sbsh/if_sbsh.c
@@ -200,7 +200,8 @@ static driver_t sbsh_driver = {
 
 static devclass_t sbsh_devclass;
 
-DRIVER_MODULE(if_sbsh, pci, sbsh_driver, sbsh_devclass, 0, 0);
+DRIVER_MODULE(sbsh, pci, sbsh_driver, sbsh_devclass, 0, 0);
+MODULE_DEPEND(sbsh, pci, 1, 1, 1);
 
 static int
 sbsh_probe(device_t dev)
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 388a22abfb34..ea3cf3ec776d 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -118,6 +118,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_sfreg.h>
 
+MODULE_DEPEND(sf, pci, 1, 1, 1);
+MODULE_DEPEND(sf, ether, 1, 1, 1);
 MODULE_DEPEND(sf, miibus, 1, 1, 1);
 
 static struct sf_type sf_devs[] = {
@@ -203,7 +205,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
-DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
+DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
 DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
 
 #define SF_SETBIT(sc, reg, x)	\
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 32e13ab409e5..8b15c5cd2b14 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -107,6 +107,8 @@ __FBSDID("$FreeBSD$");
 #include <pci/if_skreg.h>
 #include <pci/xmaciireg.h>
 
+MODULE_DEPEND(sk, pci, 1, 1, 1);
+MODULE_DEPEND(sk, ether, 1, 1, 1);
 MODULE_DEPEND(sk, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -236,7 +238,7 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
-DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
+DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0);
 DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
 DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index d31c2dfaf83f..868220e51c32 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -87,4 +87,6 @@ static driver_t sn_isa_driver = {
 
 extern devclass_t sn_devclass;
 
-DRIVER_MODULE(if_sn, isa, sn_isa_driver, sn_devclass, 0, 0);
+DRIVER_MODULE(sn, isa, sn_isa_driver, sn_devclass, 0, 0);
+MODULE_DEPEND(sn, isa, 1, 1, 1);
+MODULE_DEPEND(sn, ether, 1, 1, 1);
diff --git a/sys/dev/sn/if_sn_pccard.c b/sys/dev/sn/if_sn_pccard.c
index 88812bdc44ea..498db98b2721 100644
--- a/sys/dev/sn/if_sn_pccard.c
+++ b/sys/dev/sn/if_sn_pccard.c
@@ -126,5 +126,6 @@ static driver_t sn_pccard_driver = {
 
 extern devclass_t sn_devclass;
 
-DRIVER_MODULE(if_sn, pccard, sn_pccard_driver, sn_devclass, 0, 0);
-MODULE_DEPEND(if_sn, pccard, 1, 1, 1);
+DRIVER_MODULE(sn, pccard, sn_pccard_driver, sn_devclass, 0, 0);
+MODULE_DEPEND(sn, pccard, 1, 1, 1);
+MODULE_DEPEND(sn, ether, 1, 1, 1);
diff --git a/sys/dev/snc/if_snc_cbus.c b/sys/dev/snc/if_snc_cbus.c
index 3d207a78e57d..0a5af7e00b47 100644
--- a/sys/dev/snc/if_snc_cbus.c
+++ b/sys/dev/snc/if_snc_cbus.c
@@ -216,4 +216,6 @@ static driver_t snc_isa_driver = {
 	sizeof(struct snc_softc)
 };
 
-DRIVER_MODULE(if_snc, isa, snc_isa_driver, snc_devclass, 0, 0);
+DRIVER_MODULE(snc, isa, snc_isa_driver, snc_devclass, 0, 0);
+MODULE_DEPEND(snc, isa, 1, 1, 1);
+MODULE_DEPEND(snc, ether, 1, 1, 1);
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index 4c9b92383302..ae5aaf995291 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -76,7 +76,9 @@ static driver_t snc_pccard_driver = {
 	sizeof(struct snc_softc)
 };
 
-DRIVER_MODULE(if_snc, pccard, snc_pccard_driver, snc_devclass, 0, 0);
+DRIVER_MODULE(snc, pccard, snc_pccard_driver, snc_devclass, 0, 0);
+MODULE_DEPEND(snc, ether, 1, 1, 1);
+MODULE_DEPEND(snc, pccard, 1, 1, 1);
 
 /*
  *      snc_pccard_detach - unload the driver and clear the table.
diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 46adf353f705..e0f59cce5cd6 100644
--- a/sys/dev/sr/if_sr_isa.c
+++ b/sys/dev/sr/if_sr_isa.c
@@ -93,7 +93,8 @@ static driver_t sr_isa_driver = {
 	sizeof (struct sr_hardc)
 };
 
-DRIVER_MODULE(if_sr, isa, sr_isa_driver, sr_devclass, 0, 0);
+DRIVER_MODULE(sr, isa, sr_isa_driver, sr_devclass, 0, 0);
+MODULE_DEPEND(sr, isa, 1, 1, 1);
 
 static u_int	src_get8_io(u_int base, u_int off);
 static u_int	src_get16_io(u_int base, u_int off);
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index 5b2b95aa35e9..a9b33612dc06 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -69,7 +69,8 @@ static driver_t sr_pci_driver = {
 	sizeof(struct sr_hardc),
 };
 
-DRIVER_MODULE(if_sr, pci, sr_pci_driver, sr_devclass, 0, 0);
+DRIVER_MODULE(sr, pci, sr_pci_driver, sr_devclass, 0, 0);
+MODULE_DEPEND(sr, pci, 1, 1, 1);
 
 static u_int	src_get8_mem(u_int base, u_int off);
 static u_int	src_get16_mem(u_int base, u_int off);
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 2387c96926ee..c8a1c63477e7 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -279,7 +279,9 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
-DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
+DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
+MODULE_DEPEND(ti, pci, 1, 1, 1);
+MODULE_DEPEND(ti, ether, 1, 1, 1);
 
 /* List of Tigon softcs */
 static STAILQ_HEAD(ti_softc_list, ti_softc) ti_sc_list;
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 189a69ef8906..608daa0a6db2 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -81,6 +81,8 @@
 #include <dev/tx/if_txreg.h>
 #include <dev/tx/if_txvar.h>
 
+MODULE_DEPEND(tx, pci, 1, 1, 1);
+MODULE_DEPEND(tx, ether, 1, 1, 1);
 MODULE_DEPEND(tx, miibus, 1, 1, 1);
 
 static int epic_ifioctl(register struct ifnet *, u_long, caddr_t);
@@ -151,7 +153,7 @@ static driver_t epic_driver = {
 
 static devclass_t epic_devclass;
 
-DRIVER_MODULE(if_tx, pci, epic_driver, epic_devclass, 0, 0);
+DRIVER_MODULE(tx, pci, epic_driver, epic_devclass, 0, 0);
 DRIVER_MODULE(miibus, tx, miibus_driver, miibus_devclass, 0, 0);
 
 static struct epic_type epic_devs[] = {
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index dec498f58244..fb859270020e 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -182,7 +182,9 @@ static driver_t txp_driver = {
 
 static devclass_t txp_devclass;
 
-DRIVER_MODULE(if_txp, pci, txp_driver, txp_devclass, 0, 0);
+DRIVER_MODULE(txp, pci, txp_driver, txp_devclass, 0, 0);
+MODULE_DEPEND(txp, pci, 1, 1, 1);
+MODULE_DEPEND(txp, ether, 1, 1, 1);
 
 static int
 txp_probe(dev)
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 14346154d06b..80e8b42f77b9 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -92,8 +92,9 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/usb/if_auereg.h>
 
-MODULE_DEPEND(if_aue, miibus, 1, 1, 1);
-MODULE_DEPEND(if_aue, usb, 1, 1, 1);
+MODULE_DEPEND(aue, usb, 1, 1, 1);
+MODULE_DEPEND(aue, ether, 1, 1, 1);
+MODULE_DEPEND(aue, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
 #include "miibus_if.h"
@@ -235,7 +236,7 @@ Static driver_t aue_driver = {
 
 Static devclass_t aue_devclass;
 
-DRIVER_MODULE(if_aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
+DRIVER_MODULE(aue, uhub, aue_driver, aue_devclass, usbd_driver_load, 0);
 DRIVER_MODULE(miibus, aue, miibus_driver, miibus_devclass, 0, 0);
 
 #define AUE_SETBIT(sc, reg, x)				\
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index ac25b4776c79..b88d56fea790 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -139,8 +139,9 @@ Static driver_t cue_driver = {
 
 Static devclass_t cue_devclass;
 
-DRIVER_MODULE(if_cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
-MODULE_DEPEND(if_cue, usb, 1, 1, 1);
+DRIVER_MODULE(cue, uhub, cue_driver, cue_devclass, usbd_driver_load, 0);
+MODULE_DEPEND(cue, usb, 1, 1, 1);
+MODULE_DEPEND(cue, ether, 1, 1, 1);
 
 #define CUE_SETBIT(sc, reg, x)				\
 	cue_csr_write_1(sc, reg, cue_csr_read_1(sc, reg) | (x))
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index 000a646d1da2..3502b943e7da 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -93,7 +93,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/if_kuereg.h>
 #include <dev/usb/kue_fw.h>
 
-MODULE_DEPEND(if_kue, usb, 1, 1, 1);
+MODULE_DEPEND(kue, usb, 1, 1, 1);
+MODULE_DEPEND(kue, ether, 1, 1, 1);
 
 /*
  * Various supported device vendors/products.
@@ -167,7 +168,7 @@ Static driver_t kue_driver = {
 
 Static devclass_t kue_devclass;
 
-DRIVER_MODULE(if_kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
+DRIVER_MODULE(kue, uhub, kue_driver, kue_devclass, usbd_driver_load, 0);
 
 /*
  * We have a custom do_request function which is almost like the
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index ad0ed09c07d2..f5dc39daf23e 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_vrreg.h>
 
+MODULE_DEPEND(vr, pci, 1, 1, 1);
+MODULE_DEPEND(vr, ether, 1, 1, 1);
 MODULE_DEPEND(vr, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -200,7 +202,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
-DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
+DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
 DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
 
 #define VR_SETBIT(sc, reg, x)				\
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index df73eaf528ae..095f9df004ea 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -69,7 +69,9 @@ static driver_t vx_driver = {
 
 static devclass_t vx_devclass;
 
-DRIVER_MODULE(if_vx, pci, vx_driver, vx_devclass, 0, 0);
+DRIVER_MODULE(vx, pci, vx_driver, vx_devclass, 0, 0);
+MODULE_DEPEND(vx, pci, 1, 1, 1);
+MODULE_DEPEND(vx, ether, 1, 1, 1);
 
 static void
 vx_pci_shutdown(
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 3cb085e7f7ca..69547e68ab81 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -116,8 +116,9 @@ static driver_t wi_pccard_driver = {
 	sizeof(struct wi_softc)
 };
 
-DRIVER_MODULE(if_wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
-MODULE_DEPEND(if_wi, wlan, 1, 1, 1);
+DRIVER_MODULE(wi, pccard, wi_pccard_driver, wi_devclass, 0, 0);
+MODULE_DEPEND(wi, wlan, 1, 1, 1);
+MODULE_DEPEND(wi, pccard, 1, 1, 1);
 
 #if __FreeBSD_version >= 500000
 static const struct pccard_product wi_pccard_products[] = {
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index cd58a2fc50f7..4f15d472956d 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -107,8 +107,9 @@ static struct {
 	{0, 0, 0, NULL}
 };
 
-DRIVER_MODULE(if_wi, pci, wi_pci_driver, wi_devclass, 0, 0);
-MODULE_DEPEND(if_wi, wlan, 1, 1, 1);
+DRIVER_MODULE(wi, pci, wi_pci_driver, wi_devclass, 0, 0);
+MODULE_DEPEND(wi, pci, 1, 1, 1);
+MODULE_DEPEND(wi, wlan, 1, 1, 1);
 
 static int
 wi_pci_probe(dev)
diff --git a/sys/pci/agp_ali.c b/sys/pci/agp_ali.c
index fc8004c4d1b0..f89d14be7753 100644
--- a/sys/pci/agp_ali.c
+++ b/sys/pci/agp_ali.c
@@ -264,3 +264,5 @@ static driver_t agp_ali_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_ali, pci, agp_ali_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_ali, agp, 1, 1, 1);
+MODULE_DEPEND(agp_ali, pci, 1, 1, 1);
diff --git a/sys/pci/agp_amd.c b/sys/pci/agp_amd.c
index 7c4d0ef22801..24e3cc9a15fb 100644
--- a/sys/pci/agp_amd.c
+++ b/sys/pci/agp_amd.c
@@ -417,3 +417,5 @@ static driver_t agp_amd_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_amd, pci, agp_amd_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_amd, agp, 1, 1, 1);
+MODULE_DEPEND(agp_amd, pci, 1, 1, 1);
diff --git a/sys/pci/agp_i810.c b/sys/pci/agp_i810.c
index 39890ac4cd64..29acc1b42460 100644
--- a/sys/pci/agp_i810.c
+++ b/sys/pci/agp_i810.c
@@ -701,3 +701,5 @@ static driver_t agp_i810_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_i810, pci, agp_i810_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_i810, agp, 1, 1, 1);
+MODULE_DEPEND(agp_i810, pci, 1, 1, 1);
diff --git a/sys/pci/agp_intel.c b/sys/pci/agp_intel.c
index 6441fd9aa557..c1d933a1227f 100644
--- a/sys/pci/agp_intel.c
+++ b/sys/pci/agp_intel.c
@@ -378,3 +378,5 @@ static driver_t agp_intel_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_intel, pci, agp_intel_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_intel, agp, 1, 1, 1);
+MODULE_DEPEND(agp_intel, pci, 1, 1, 1);
diff --git a/sys/pci/agp_sis.c b/sys/pci/agp_sis.c
index 36145440c240..00cb991b126f 100644
--- a/sys/pci/agp_sis.c
+++ b/sys/pci/agp_sis.c
@@ -258,3 +258,5 @@ static driver_t agp_sis_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_sis, pci, agp_sis_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_sis, agp, 1, 1, 1);
+MODULE_DEPEND(agp_sis, pci, 1, 1, 1);
diff --git a/sys/pci/agp_via.c b/sys/pci/agp_via.c
index fabebeb6dd1d..4d13230db422 100644
--- a/sys/pci/agp_via.c
+++ b/sys/pci/agp_via.c
@@ -255,3 +255,5 @@ static driver_t agp_via_driver = {
 static devclass_t agp_devclass;
 
 DRIVER_MODULE(agp_via, pci, agp_via_driver, agp_devclass, 0, 0);
+MODULE_DEPEND(agp_via, agp, 1, 1, 1);
+MODULE_DEPEND(agp_via, pci, 1, 1, 1);
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index ae12197f97c8..44e0c74d7038 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -637,5 +637,6 @@ static driver_t alpm_driver = {
 };
 
 DRIVER_MODULE(alpm, pci, alpm_driver, alpm_devclass, 0, 0);
+MODULE_DEPEND(alpm, pci, 1, 1, 1);
 MODULE_DEPEND(alpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(alpm, 1);
diff --git a/sys/pci/amdpm.c b/sys/pci/amdpm.c
index c04b57ac0083..4fc51b9c7a2b 100644
--- a/sys/pci/amdpm.c
+++ b/sys/pci/amdpm.c
@@ -676,6 +676,7 @@ static driver_t nfpm_driver = {
 DRIVER_MODULE(amdpm, pci, amdpm_driver, amdpm_devclass, 0, 0);
 DRIVER_MODULE(nfpm, pci, nfpm_driver, nfpm_devclass, 0, 0);
 
+MODULE_DEPEND(amdpm, pci, 1, 1, 1);
 MODULE_DEPEND(amdpm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(amdpm, 1);
 
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 72cb9612cf10..303f2905d676 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -88,6 +88,7 @@ static driver_t cy_pci_driver = {
 static devclass_t	cy_devclass;
 
 DRIVER_MODULE(cy, pci, cy_pci_driver, cy_devclass, 0, 0);
+MODULE_DEPEND(cy, pci, 1, 1, 1);
 
 static int
 cy_pci_probe(dev)
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 240bdba6b4ec..86fd9d595a12 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -131,6 +131,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_dcreg.h>
 
+MODULE_DEPEND(dc, pci, 1, 1, 1);
+MODULE_DEPEND(dc, ether, 1, 1, 1);
 MODULE_DEPEND(dc, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -306,8 +308,8 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW,
 	&dc_quick,0,"do not mdevget in dc driver");
 #endif
 
-DRIVER_MODULE(if_dc, cardbus, dc_driver, dc_devclass, 0, 0);
-DRIVER_MODULE(if_dc, pci, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
+DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
 DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
 
 #define DC_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 44de0806d195..e6d5892c6756 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -5259,4 +5259,4 @@ static driver_t tulip_pci_driver = {
     sizeof(tulip_softc_t),
 };
 static devclass_t tulip_devclass;
-DRIVER_MODULE(if_de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
+DRIVER_MODULE(de, pci, tulip_pci_driver, tulip_devclass, 0, 0);
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 4b99da71cccb..68d0d651c909 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -481,5 +481,5 @@ static driver_t en_driver = {
 
 static devclass_t en_devclass;
 
-DRIVER_MODULE(if_en, pci, en_driver, en_devclass, 0, 0);
+DRIVER_MODULE(en, pci, en_driver, en_devclass, 0, 0);
 
diff --git a/sys/pci/if_pcn.c b/sys/pci/if_pcn.c
index a97230ab2329..3c60e0f69cc3 100644
--- a/sys/pci/if_pcn.c
+++ b/sys/pci/if_pcn.c
@@ -87,6 +87,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_pcnreg.h>
 
+MODULE_DEPEND(pcn, pci, 1, 1, 1);
+MODULE_DEPEND(pcn, ether, 1, 1, 1);
 MODULE_DEPEND(pcn, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -174,7 +176,7 @@ static driver_t pcn_driver = {
 
 static devclass_t pcn_devclass;
 
-DRIVER_MODULE(if_pcn, pci, pcn_driver, pcn_devclass, 0, 0);
+DRIVER_MODULE(pcn, pci, pcn_driver, pcn_devclass, 0, 0);
 DRIVER_MODULE(miibus, pcn, miibus_driver, miibus_devclass, 0, 0);
 
 #define PCN_CSR_SETBIT(sc, reg, x)			\
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 7a225988c5cf..09965971828b 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -111,6 +111,8 @@
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
+MODULE_DEPEND(rl, pci, 1, 1, 1);
+MODULE_DEPEND(rl, ether, 1, 1, 1);
 MODULE_DEPEND(rl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -241,8 +243,8 @@ static driver_t rl_driver = {
 
 static devclass_t rl_devclass;
 
-DRIVER_MODULE(if_rl, pci, rl_driver, rl_devclass, 0, 0);
-DRIVER_MODULE(if_rl, cardbus, rl_driver, rl_devclass, 0, 0);
+DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
+DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
 DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
 
 #define EE_SET(x)					\
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 388a22abfb34..ea3cf3ec776d 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -118,6 +118,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_sfreg.h>
 
+MODULE_DEPEND(sf, pci, 1, 1, 1);
+MODULE_DEPEND(sf, ether, 1, 1, 1);
 MODULE_DEPEND(sf, miibus, 1, 1, 1);
 
 static struct sf_type sf_devs[] = {
@@ -203,7 +205,7 @@ static driver_t sf_driver = {
 
 static devclass_t sf_devclass;
 
-DRIVER_MODULE(if_sf, pci, sf_driver, sf_devclass, 0, 0);
+DRIVER_MODULE(sf, pci, sf_driver, sf_devclass, 0, 0);
 DRIVER_MODULE(miibus, sf, miibus_driver, miibus_devclass, 0, 0);
 
 #define SF_SETBIT(sc, reg, x)	\
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 21d2c2e7f604..dfbb56079e52 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -96,6 +96,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_sisreg.h>
 
+MODULE_DEPEND(sis, pci, 1, 1, 1);
+MODULE_DEPEND(sis, ether, 1, 1, 1);
 MODULE_DEPEND(sis, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -199,7 +201,7 @@ static driver_t sis_driver = {
 
 static devclass_t sis_devclass;
 
-DRIVER_MODULE(if_sis, pci, sis_driver, sis_devclass, 0, 0);
+DRIVER_MODULE(sis, pci, sis_driver, sis_devclass, 0, 0);
 DRIVER_MODULE(miibus, sis, miibus_driver, miibus_devclass, 0, 0);
 
 #define SIS_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 32e13ab409e5..8b15c5cd2b14 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -107,6 +107,8 @@ __FBSDID("$FreeBSD$");
 #include <pci/if_skreg.h>
 #include <pci/xmaciireg.h>
 
+MODULE_DEPEND(sk, pci, 1, 1, 1);
+MODULE_DEPEND(sk, ether, 1, 1, 1);
 MODULE_DEPEND(sk, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -236,7 +238,7 @@ static driver_t sk_driver = {
 
 static devclass_t sk_devclass;
 
-DRIVER_MODULE(if_sk, pci, skc_driver, skc_devclass, 0, 0);
+DRIVER_MODULE(sk, pci, skc_driver, skc_devclass, 0, 0);
 DRIVER_MODULE(sk, skc, sk_driver, sk_devclass, 0, 0);
 DRIVER_MODULE(miibus, sk, miibus_driver, miibus_devclass, 0, 0);
 
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 4b93da01f1a7..d6e505b862f1 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -72,6 +72,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_stereg.h>
 
+MODULE_DEPEND(ste, pci, 1, 1, 1);
+MODULE_DEPEND(ste, ether, 1, 1, 1);
 MODULE_DEPEND(ste, miibus, 1, 1, 1);
 
 /*
@@ -157,7 +159,7 @@ static driver_t ste_driver = {
 
 static devclass_t ste_devclass;
 
-DRIVER_MODULE(if_ste, pci, ste_driver, ste_devclass, 0, 0);
+DRIVER_MODULE(ste, pci, ste_driver, ste_devclass, 0, 0);
 DRIVER_MODULE(miibus, ste, miibus_driver, miibus_devclass, 0, 0);
 
 #define STE_SETBIT4(sc, reg, x)				\
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 2387c96926ee..c8a1c63477e7 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -279,7 +279,9 @@ static driver_t ti_driver = {
 
 static devclass_t ti_devclass;
 
-DRIVER_MODULE(if_ti, pci, ti_driver, ti_devclass, 0, 0);
+DRIVER_MODULE(ti, pci, ti_driver, ti_devclass, 0, 0);
+MODULE_DEPEND(ti, pci, 1, 1, 1);
+MODULE_DEPEND(ti, ether, 1, 1, 1);
 
 /* List of Tigon softcs */
 static STAILQ_HEAD(ti_softc_list, ti_softc) ti_sc_list;
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index 25b19f88d917..c546ad95d1d9 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -219,6 +219,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_tlreg.h>
 
+MODULE_DEPEND(tl, pci, 1, 1, 1);
+MODULE_DEPEND(tl, ether, 1, 1, 1);
 MODULE_DEPEND(tl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -352,7 +354,7 @@ static driver_t tl_driver = {
 
 static devclass_t tl_devclass;
 
-DRIVER_MODULE(if_tl, pci, tl_driver, tl_devclass, 0, 0);
+DRIVER_MODULE(tl, pci, tl_driver, tl_devclass, 0, 0);
 DRIVER_MODULE(miibus, tl, miibus_driver, miibus_devclass, 0, 0);
 
 static u_int8_t tl_dio_read8(sc, reg)
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index ad0ed09c07d2..f5dc39daf23e 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -95,6 +95,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_vrreg.h>
 
+MODULE_DEPEND(vr, pci, 1, 1, 1);
+MODULE_DEPEND(vr, ether, 1, 1, 1);
 MODULE_DEPEND(vr, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -200,7 +202,7 @@ static driver_t vr_driver = {
 
 static devclass_t vr_devclass;
 
-DRIVER_MODULE(if_vr, pci, vr_driver, vr_devclass, 0, 0);
+DRIVER_MODULE(vr, pci, vr_driver, vr_devclass, 0, 0);
 DRIVER_MODULE(miibus, vr, miibus_driver, miibus_devclass, 0, 0);
 
 #define VR_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index fe5ec34edc47..61c26742988d 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -125,6 +125,8 @@ __FBSDID("$FreeBSD$");
 
 #include <pci/if_wbreg.h>
 
+MODULE_DEPEND(wb, pci, 1, 1, 1);
+MODULE_DEPEND(wb, ether, 1, 1, 1);
 MODULE_DEPEND(wb, miibus, 1, 1, 1);
 
 /*
@@ -218,7 +220,7 @@ static driver_t wb_driver = {
 
 static devclass_t wb_devclass;
 
-DRIVER_MODULE(if_wb, pci, wb_driver, wb_devclass, 0, 0);
+DRIVER_MODULE(wb, pci, wb_driver, wb_devclass, 0, 0);
 DRIVER_MODULE(miibus, wb, miibus_driver, miibus_devclass, 0, 0);
 
 #define WB_SETBIT(sc, reg, x)				\
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index 344e75c7dc92..88797d4a21e4 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -132,6 +132,8 @@ __FBSDID("$FreeBSD$");
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
 
+MODULE_DEPEND(xl, pci, 1, 1, 1);
+MODULE_DEPEND(xl, ether, 1, 1, 1);
 MODULE_DEPEND(xl, miibus, 1, 1, 1);
 
 /* "controller miibus0" required.  See GENERIC if you get errors here. */
@@ -292,8 +294,8 @@ static driver_t xl_driver = {
 
 static devclass_t xl_devclass;
 
-DRIVER_MODULE(if_xl, cardbus, xl_driver, xl_devclass, 0, 0);
-DRIVER_MODULE(if_xl, pci, xl_driver, xl_devclass, 0, 0);
+DRIVER_MODULE(xl, cardbus, xl_driver, xl_devclass, 0, 0);
+DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
 DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
 
 static void
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index bd7b5c318cd3..e331d4f24101 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -7157,7 +7157,8 @@ static driver_t ncr_driver = {
 
 static devclass_t ncr_devclass;
 
-DRIVER_MODULE(if_ncr, pci, ncr_driver, ncr_devclass, 0, 0);
+DRIVER_MODULE(ncr, pci, ncr_driver, ncr_devclass, 0, 0);
+MODULE_DEPEND(ncr, pci, 1, 1, 1);
 
 /*=========================================================================*/
 #endif /* _KERNEL */
diff --git a/sys/pci/viapm.c b/sys/pci/viapm.c
index faee3cdbec27..6f02a6d0c976 100644
--- a/sys/pci/viapm.c
+++ b/sys/pci/viapm.c
@@ -919,6 +919,8 @@ static driver_t viapropm_driver = {
 DRIVER_MODULE(viapm, pci, viapm_driver, viapm_devclass, 0, 0);
 DRIVER_MODULE(viapropm, pci, viapropm_driver, viapropm_devclass, 0, 0);
 
+MODULE_DEPEND(viapm, pci, 1, 1, 1);
+MODULE_DEPEND(viaprom, pci, 1, 1, 1);
 MODULE_DEPEND(viapm, iicbb, IICBB_MINVER, IICBB_PREFVER, IICBB_MAXVER);
 MODULE_DEPEND(viapropm, smbus, SMBUS_MINVER, SMBUS_PREFVER, SMBUS_MAXVER);
 MODULE_VERSION(viapm, 1);
diff --git a/sys/pci/xrpu.c b/sys/pci/xrpu.c
index eca1a118a0a5..6e0ee05a49f9 100644
--- a/sys/pci/xrpu.c
+++ b/sys/pci/xrpu.c
@@ -263,3 +263,4 @@ static driver_t xrpu_driver = {
  
  
 DRIVER_MODULE(xrpu, pci, xrpu_driver, xrpu_devclass, 0, 0);
+MODULE_DEPEND(xrpu, pci, 1, 1, 1);