9 files changed, 9 insertions, 9 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 57873bb..cf6482e 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -245,7 +245,7 @@ static struct periph_driver cddriver =
 	TAILQ_HEAD_INITIALIZER(cddriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, cddriver);
+PERIPHDRIVER_DECLARE(cd, cddriver);
 
 /* For 2.2-stable support */
 #ifndef D_DISK
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index 25f6cdd..2923ab2 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -209,7 +209,7 @@ static struct periph_driver chdriver =
 	TAILQ_HEAD_INITIALIZER(chdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, chdriver);
+PERIPHDRIVER_DECLARE(ch, chdriver);
 
 static struct cdevsw ch_cdevsw = {
 	/* open */	chopen,
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 70385c7..cdd70d2 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -299,7 +299,7 @@ static struct periph_driver dadriver =
 	TAILQ_HEAD_INITIALIZER(dadriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, dadriver);
+PERIPHDRIVER_DECLARE(da, dadriver);
 
 #define DA_CDEV_MAJOR 13
 #define DA_BDEV_MAJOR 4
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index d329fc5..791a71d 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -107,7 +107,7 @@ static struct periph_driver passdriver =
 	TAILQ_HEAD_INITIALIZER(passdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, passdriver);
+PERIPHDRIVER_DECLARE(pass, passdriver);
 
 static struct cdevsw pass_cdevsw = {
 	/* open */	passopen,
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index 541964f..beec14d 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -114,7 +114,7 @@ static struct periph_driver ptdriver =
 	TAILQ_HEAD_INITIALIZER(ptdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, ptdriver);
+PERIPHDRIVER_DECLARE(pt, ptdriver);
 
 #define PT_CDEV_MAJOR 61
 
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 99b204d..0418f44 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -402,7 +402,7 @@ static struct periph_driver sadriver =
 	TAILQ_HEAD_INITIALIZER(sadriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, sadriver);
+PERIPHDRIVER_DECLARE(sa, sadriver);
 
 /* For 2.2-stable support */
 #ifndef D_TAPE
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index 6d7c4d1..d2ab63d 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -173,7 +173,7 @@ static struct periph_driver sesdriver = {
 	TAILQ_HEAD_INITIALIZER(sesdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, sesdriver);
+PERIPHDRIVER_DECLARE(ses, sesdriver);
 
 static struct cdevsw ses_cdevsw = 
 {
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index 82a4264..95f2631 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -149,7 +149,7 @@ static struct periph_driver targbhdriver =
 	TAILQ_HEAD_INITIALIZER(targbhdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, targbhdriver);
+PERIPHDRIVER_DECLARE(targbh, targbhdriver);
 
 static void
 targbhinit(void)
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index fd3ea00..cad49a3 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -228,7 +228,7 @@ static struct periph_driver targdriver =
 	TAILQ_HEAD_INITIALIZER(targdriver.units), /* generation */ 0
 };
 
-DATA_SET(periphdriver_set, targdriver);
+PERIPHDRIVER_DECLARE(targ, targdriver);
 
 static struct extend_array *targperiphs;
 static dev_t targ_ctl_dev;