29 files changed, 50 insertions, 2 deletions

diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index a04e6daf00a9..837cdc62679c 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -82,6 +82,8 @@ static driver_t aac_pci_driver = {
 static devclass_t	aac_devclass;
 
 DRIVER_MODULE(aac, pci, aac_pci_driver, aac_devclass, 0, 0);
+MODULE_DEPEND(aac, pci, 1, 1, 1);
+
 
 struct aac_ident
 {
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c
index 7457a6b10c7d..08b98d014d1b 100644
--- a/sys/dev/advansys/adv_eisa.c
+++ b/sys/dev/advansys/adv_eisa.c
@@ -351,3 +351,4 @@ static driver_t adv_eisa_driver = {
 
 static devclass_t adv_eisa_devclass;
 DRIVER_MODULE(adv, eisa, adv_eisa_driver, adv_eisa_devclass, 0, 0);
+MODULE_DEPEND(adv, eisa, 1, 1, 1);
diff --git a/sys/dev/advansys/adv_isa.c b/sys/dev/advansys/adv_isa.c
index 7bfb93babdf9..dde65ef4dcb7 100644
--- a/sys/dev/advansys/adv_isa.c
+++ b/sys/dev/advansys/adv_isa.c
@@ -430,3 +430,4 @@ static driver_t adv_isa_driver = {
 
 static devclass_t adv_isa_devclass;
 DRIVER_MODULE(adv, isa, adv_isa_driver, adv_isa_devclass, 0, 0);
+MODULE_DEPEND(adv, isa, 1, 1, 1);
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 9a0d9ec285e1..7ce53b69561c 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -332,3 +332,4 @@ static driver_t adv_pci_driver = {
 
 static devclass_t adv_pci_devclass;
 DRIVER_MODULE(adv, pci, adv_pci_driver, adv_pci_devclass, 0, 0);
+MODULE_DEPEND(adv, pci, 1, 1, 1);
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 53d9e424d2a6..5a37af7214f1 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 
 #include <machine/bus.h>
@@ -1443,3 +1444,4 @@ adv_attach(adv)
 	xpt_action((union ccb *)&csa);
 	return (0);
 }
+MODULE_DEPEND(adv, cam, 1, 1, 1);
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 74ea7b5c4e16..8777a4428abc 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -146,6 +146,7 @@ static driver_t adw_pci_driver = {
 static devclass_t adw_devclass;
 
 DRIVER_MODULE(adw, pci, adw_pci_driver, adw_devclass, 0, 0);
+MODULE_DEPEND(adw, pci, 1, 1, 1);
 
 static __inline u_int64_t
 adw_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
diff --git a/sys/dev/advansys/adwcam.c b/sys/dev/advansys/adwcam.c
index 1ec1877570ad..ccf15eb266c6 100644
--- a/sys/dev/advansys/adwcam.c
+++ b/sys/dev/advansys/adwcam.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/bus.h>
 
@@ -1580,3 +1581,5 @@ adw_handle_bus_reset(struct adw_softc *adw, int initiated)
 		xpt_async(AC_BUS_RESET, adw->path, NULL);
 	adw->last_reset = CAM_SCSI_BUS_RESET;
 }
+MODULE_DEPEND(adw, cam, 1, 1, 1);
+
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index 3c7487b38111..714c1bb9aee9 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 
 #include <machine/bus.h>
@@ -1872,3 +1873,4 @@ aha_detach(struct aha_softc *aha)
 	cam_sim_free(aha->sim, /*free_devq*/TRUE);
 	return (0);
 }
+MODULE_DEPEND(aha, cam, 1, 1, 1);
diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c
index e2bd467f129e..93e7955542bb 100644
--- a/sys/dev/aha/aha_isa.c
+++ b/sys/dev/aha/aha_isa.c
@@ -374,4 +374,4 @@ static driver_t aha_isa_driver = {
 static devclass_t aha_devclass;
 
 DRIVER_MODULE(aha, isa, aha_isa_driver, aha_devclass, 0, 0);
-MODULE_DEPEND(aha, cam, 1, 1, 1);
+MODULE_DEPEND(aha, isa, 1, 1, 1);
diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c
index 366bcb8affcd..f7ad707716f7 100644
--- a/sys/dev/aha/aha_mca.c
+++ b/sys/dev/aha/aha_mca.c
@@ -229,4 +229,4 @@ static driver_t aha_mca_driver = {
 static devclass_t aha_devclass;
 
 DRIVER_MODULE(aha, mca, aha_mca_driver, aha_devclass, 0, 0);
-MODULE_DEPEND(aha, cam, 1, 1, 1);
+MODULE_DEPEND(aha, mca, 1, 1, 1);
diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c
index 738103185869..4455886b373f 100644
--- a/sys/dev/ahb/ahb.c
+++ b/sys/dev/ahb/ahb.c
@@ -1366,3 +1366,5 @@ static driver_t ahb_eisa_driver = {
 static devclass_t ahb_devclass;
 
 DRIVER_MODULE(ahb, eisa, ahb_eisa_driver, ahb_devclass, 0, 0);
+MODULE_DEPEND(ahb, eisa, 1, 1, 1);
+MODULE_DEPEND(ahb, cam, 1, 1, 1);
diff --git a/sys/dev/amd/amd.c b/sys/dev/amd/amd.c
index c20c9b3aa725..65411103348b 100644
--- a/sys/dev/amd/amd.c
+++ b/sys/dev/amd/amd.c
@@ -2534,4 +2534,5 @@ static driver_t amd_driver = {
 
 static devclass_t amd_devclass;
 DRIVER_MODULE(amd, pci, amd_driver, amd_devclass, 0, 0);
+MODULE_DEPEND(amd, pci, 1, 1, 1);
 MODULE_DEPEND(amd, cam, 1, 1, 1);
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index f873edfc37a2..7d48572dfd4d 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -119,6 +119,8 @@ static driver_t amr_pci_driver = {
 
 static devclass_t	amr_devclass;
 DRIVER_MODULE(amr, pci, amr_pci_driver, amr_devclass, 0, 0);
+MODULE_DEPEND(amr, pci, 1, 1, 1);
+MODULE_DEPEND(amr, cam, 1, 1, 1);
 
 static struct amr_ident
 {
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 2810e2dbe074..4da0343e923c 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -198,6 +198,8 @@ static driver_t arcmsr_driver={
 
 static devclass_t arcmsr_devclass;
 DRIVER_MODULE(arcmsr,pci,arcmsr_driver,arcmsr_devclass,0,0);
+MODULE_DEPEND(arcmsr, pci, 1, 1, 1);
+MODULE_DEPEND(arcmsr, cam, 1, 1, 1);
 
 #if __FreeBSD_version >= 502010
 	static struct cdevsw arcmsr_cdevsw={
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 2d5e062c796b..9c8dde4dcecb 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -427,6 +427,8 @@ static driver_t asr_driver = {
 
 static devclass_t asr_devclass;
 DRIVER_MODULE(asr, pci, asr_driver, asr_devclass, 0, 0);
+MODULE_DEPEND(asr, pci, 1, 1, 1);
+MODULE_DEPEND(asr, cam, 1, 1, 1);
 
 /*
  * devsw for asr hba driver
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index 765cabb260d3..af030a5169e0 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/bus.h>
@@ -2424,3 +2425,5 @@ bttimeout(void *arg)
 	splx(s);
 }
 
+MODULE_VERSION(bt, 1);
+MODULE_DEPEND(bt, cam, 1, 1, 1);
diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c
index cef2e53d61ce..85a13ac0f526 100644
--- a/sys/dev/buslogic/bt_eisa.c
+++ b/sys/dev/buslogic/bt_eisa.c
@@ -354,3 +354,4 @@ static driver_t bt_eisa_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, eisa, bt_eisa_driver, bt_devclass, 0, 0);
+MODULE_DEPEND(bt, eisa, 1, 1, 1);
diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c
index 17638b22374f..6206dc6ffdf1 100644
--- a/sys/dev/buslogic/bt_isa.c
+++ b/sys/dev/buslogic/bt_isa.c
@@ -353,3 +353,4 @@ static driver_t bt_isa_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, isa, bt_isa_driver, bt_devclass, 0, 0);
+MODULE_DEPEND(bt, isa, 1, 1, 1);
diff --git a/sys/dev/buslogic/bt_mca.c b/sys/dev/buslogic/bt_mca.c
index aca0f00cf4f0..2f72ee426412 100644
--- a/sys/dev/buslogic/bt_mca.c
+++ b/sys/dev/buslogic/bt_mca.c
@@ -338,3 +338,4 @@ static driver_t bt_mca_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, mca, bt_mca_driver, bt_devclass, 0, 0);
+MODULE_DEPEND(bt, mca, 1, 1, 1);
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index 51d15cb3ca49..de7cc9ed4e8b 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -235,3 +235,4 @@ static driver_t bt_pci_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, pci, bt_pci_driver, bt_devclass, 0, 0);
+MODULE_DEPEND(bt, pci, 1, 1, 1);
diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c
index 1a6ef9a7bb6d..ea84fb0abc9a 100644
--- a/sys/dev/dpt/dpt_eisa.c
+++ b/sys/dev/dpt/dpt_eisa.c
@@ -212,3 +212,5 @@ static driver_t dpt_eisa_driver = {
 };
 
 DRIVER_MODULE(dpt, eisa, dpt_eisa_driver, dpt_devclass, 0, 0);
+MODULE_DEPEND(dpt, eisa, 1, 1, 1);
+MODULE_DEPEND(dpt, cam, 1, 1, 1);
diff --git a/sys/dev/dpt/dpt_isa.c b/sys/dev/dpt/dpt_isa.c
index c9264af3708c..96b67f2fcb0a 100644
--- a/sys/dev/dpt/dpt_isa.c
+++ b/sys/dev/dpt/dpt_isa.c
@@ -268,3 +268,5 @@ static driver_t dpt_isa_driver = {
 };
 
 DRIVER_MODULE(dpt, isa, dpt_isa_driver, dpt_devclass, 0, 0);
+MODULE_DEPEND(dpt, isa, 1, 1, 1);
+MODULE_DEPEND(dpt, cam, 1, 1, 1);
diff --git a/sys/dev/dpt/dpt_pci.c b/sys/dev/dpt/dpt_pci.c
index c91ab25b1ef9..e5bc6bcb5b26 100644
--- a/sys/dev/dpt/dpt_pci.c
+++ b/sys/dev/dpt/dpt_pci.c
@@ -195,3 +195,5 @@ static driver_t dpt_pci_driver = {
 };
 
 DRIVER_MODULE(dpt, pci, dpt_pci_driver, dpt_devclass, 0, 0);
+MODULE_DEPEND(dpt, pci, 1, 1, 1);
+MODULE_DEPEND(dpt, cam, 1, 1, 1);
diff --git a/sys/dev/esp/esp_sbus.c b/sys/dev/esp/esp_sbus.c
index cc92f19fd6e5..ab31b96bb1ae 100644
--- a/sys/dev/esp/esp_sbus.c
+++ b/sys/dev/esp/esp_sbus.c
@@ -135,6 +135,7 @@ static driver_t esp_dma_driver = {
 };
 
 DRIVER_MODULE(esp, dma, esp_dma_driver, esp_devclass, 0, 0);
+MODULE_DEPEND(esp, dma, 1, 1, 1);
 
 static device_method_t esp_sbus_methods[] = {
 	DEVMETHOD(device_probe,		esp_probe),
@@ -152,6 +153,9 @@ static driver_t esp_sbus_driver = {
 };
 
 DRIVER_MODULE(esp, sbus, esp_sbus_driver, esp_devclass, 0, 0);
+MODULE_DEPEND(esp, sbus, 1, 1, 1);
+
+MODULE_DEPEND(esp, cam, 1, 1, 1);
 
 /*
  * Functions and the switch for the MI code.
diff --git a/sys/dev/iir/iir_pci.c b/sys/dev/iir/iir_pci.c
index f2b918e858bf..daea1e75abef 100644
--- a/sys/dev/iir/iir_pci.c
+++ b/sys/dev/iir/iir_pci.c
@@ -158,6 +158,8 @@ static  driver_t iir_pci_driver =
 static devclass_t iir_devclass;
 
 DRIVER_MODULE(iir, pci, iir_pci_driver, iir_devclass, 0, 0);
+MODULE_DEPEND(iir, pci, 1, 1, 1);
+MODULE_DEPEND(iir, cam, 1, 1, 1);
 
 static int
 iir_pci_probe(device_t dev)
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index 19ece614c76f..72c80804eca5 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -147,6 +147,8 @@ static driver_t mly_pci_driver = {
 
 static devclass_t	mly_devclass;
 DRIVER_MODULE(mly, pci, mly_pci_driver, mly_devclass, 0, 0);
+MODULE_DEPEND(mly, pci, 1, 1, 1);
+MODULE_DEPEND(mly, cam, 1, 1, 1);
 
 static struct cdevsw mly_cdevsw = {
 	.d_version =	D_VERSION,
diff --git a/sys/dev/ppbus/vpo.c b/sys/dev/ppbus/vpo.c
index f01c0d12791b..abb2ef896d49 100644
--- a/sys/dev/ppbus/vpo.c
+++ b/sys/dev/ppbus/vpo.c
@@ -465,3 +465,5 @@ static driver_t vpo_driver = {
 	sizeof(struct vpo_data),
 };
 DRIVER_MODULE(vpo, ppbus, vpo_driver, vpo_devclass, 0, 0);
+MODULE_DEPEND(vpo, ppbus, 1, 1, 1);
+MODULE_DEPEND(vpo, cam, 1, 1, 1);
diff --git a/sys/dev/trm/trm.c b/sys/dev/trm/trm.c
index 23c20d6e00be..10f547084db8 100644
--- a/sys/dev/trm/trm.c
+++ b/sys/dev/trm/trm.c
@@ -3759,4 +3759,5 @@ static driver_t trm_driver = {
 
 static devclass_t trm_devclass;
 DRIVER_MODULE(trm, pci, trm_driver, trm_devclass, 0, 0);
+MODULE_DEPEND(trm, pci, 1, 1, 1);
 MODULE_DEPEND(trm, cam, 1, 1, 1);
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index 700b79f4c2ca..209c292360e3 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -400,6 +400,8 @@ static driver_t wds_isa_driver = {
 static devclass_t wds_devclass;
 
 DRIVER_MODULE(wds, isa, wds_isa_driver, wds_devclass, 0, 0);
+MODULE_DEPEND(wds, isa, 1, 1, 1);
+MODULE_DEPEND(wds, cam, 1, 1, 1);
 
 #if WDS_ENABLE_SMALLOG==1
 #define SMALLOGSIZ	512