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

2 files changed, 6 insertions, 3 deletions

diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 1f0dfbf..df7b0d7 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 9ec044b..3aa28f8 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);