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

3 files changed, 9 insertions, 3 deletions

diff --git a/sys/dev/lnc/if_lnc_cbus.c b/sys/dev/lnc/if_lnc_cbus.c
index 571407e..5fae93e 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 949ea7d..cd643b3 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 5a6bd8d..c129e2e 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);