- 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.)

4 files changed, 12 insertions, 4 deletions

diff --git a/sys/dev/ed/if_ed_cbus.c b/sys/dev/ed/if_ed_cbus.c
index 624c2da..9676bcb 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 b833918..fd3e081 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 15f76fd..f7e563f 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 a283b6e..ee8067b 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);