Explicitly #include <scsi/scsi_debug.h> rather than assuming scsiconf.h will do

it.

Prepares for removal of #include <scsi/scsi_debug.h> from scsiconf.h as soon as
the alpha tester digs out from hurricane to compile last untested files.

8 files changed, 16 insertions, 8 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 9e67e15c8e2..289d9f83d46 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.247 2020/07/16 14:44:55 krw Exp $	*/
+/*	$OpenBSD: cd.c,v 1.248 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -70,6 +70,7 @@
 
 #include <scsi/scsi_all.h>
 #include <scsi/cd.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsi_disk.h>	/* rw_big and start_stop come from there */
 #include <scsi/scsiconf.h>
 
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 610180b12b4..c78f6306153 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ch.c,v 1.65 2020/06/30 18:43:37 krw Exp $	*/
+/*	$OpenBSD: ch.c,v 1.66 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: ch.c,v 1.26 1997/02/21 22:06:52 thorpej Exp $	*/
 
 /*
@@ -50,6 +50,7 @@
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsi_changer.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsiconf.h>
 
 #define CHRETRIES	2
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 20c04e165a0..18c1d45285b 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.268 2020/07/27 19:19:49 krw Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.269 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -45,6 +45,7 @@
 #include <sys/task.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index ef5ac0c5d01..ae2365a8643 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_ioctl.c,v 1.64 2020/07/16 14:44:55 krw Exp $	*/
+/*	$OpenBSD: scsi_ioctl.c,v 1.65 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $	*/
 
 /*
@@ -45,6 +45,7 @@
 #include <sys/fcntl.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsiconf.h>
 
 #include <sys/scsiio.h>
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 76004b55b23..39100a49d81 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.c,v 1.233 2020/08/10 12:12:44 krw Exp $	*/
+/*	$OpenBSD: scsiconf.c,v 1.234 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $	*/
 
 /*
@@ -59,6 +59,7 @@
 #include <sys/atomic.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsiconf.h>
 
 int	scsibusmatch(struct device *, void *, void *);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index da3e0ddf2da..28def02e1f5 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.313 2020/07/16 14:44:55 krw Exp $	*/
+/*	$OpenBSD: sd.c,v 1.314 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -70,6 +70,7 @@
 #include <sys/reboot.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 #include <scsi/sdvar.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 85006b04a4a..c80cf904e7d 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.179 2020/07/16 14:44:55 krw Exp $	*/
+/*	$OpenBSD: st.c,v 1.180 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -69,6 +69,7 @@
 #include <sys/vnode.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsi_tape.h>
 #include <scsi/scsiconf.h>
 
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index c43915af8c8..519317dba63 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uk.c,v 1.24 2019/12/07 15:16:24 krw Exp $	*/
+/*	$OpenBSD: uk.c,v 1.25 2020/08/11 15:23:57 krw Exp $	*/
 /*	$NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $	*/
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/vnode.h>
 
 #include <scsi/scsi_all.h>
+#include <scsi/scsi_debug.h>
 #include <scsi/scsiconf.h>
 
 #define	UKUNIT(z)	(minor(z))