- 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, 4 insertions, 2 deletions

diff --git a/sys/dev/sr/if_sr_isa.c b/sys/dev/sr/if_sr_isa.c
index 46adf35..e0f59cc 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 5b2b95a..a9b3361 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);