summaryrefslogtreecommitdiff
path: root/sys/scsi
diff options
context:
space:
mode:
Diffstat (limited to 'sys/scsi')
-rw-r--r--sys/scsi/cd.c3
-rw-r--r--sys/scsi/scsi_base.c3
-rw-r--r--sys/scsi/scsi_ioctl.c5
-rw-r--r--sys/scsi/scsiconf.c3
-rw-r--r--sys/scsi/sd.c3
-rw-r--r--sys/scsi/st.c3
-rw-r--r--sys/scsi/uk.c3
7 files changed, 8 insertions, 15 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ec2bd4479f5..a83b0662a33 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cd.c,v 1.220 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: cd.c,v 1.221 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */
/*
@@ -47,7 +47,6 @@
* Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index da7b85165c9..98b3d9640c9 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_base.c,v 1.226 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: scsi_base.c,v 1.227 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */
/*
@@ -35,7 +35,6 @@
* Detailed SCSI error printing Copyright 1997 by Matthew Jacob.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c
index be1107e577f..36dd804a5f1 100644
--- a/sys/scsi/scsi_ioctl.c
+++ b/sys/scsi/scsi_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsi_ioctl.c,v 1.52 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: scsi_ioctl.c,v 1.53 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */
/*
@@ -37,9 +37,8 @@
* Berkeley style copyright.
*/
-#include <sys/types.h>
-#include <sys/errno.h>
#include <sys/param.h>
+#include <sys/errno.h>
#include <sys/systm.h>
#include <sys/file.h>
#include <sys/pool.h>
diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c
index 89f10076010..eca0926cbf0 100644
--- a/sys/scsi/scsiconf.c
+++ b/sys/scsi/scsiconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scsiconf.c,v 1.195 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: scsiconf.c,v 1.196 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */
/*
@@ -50,7 +50,6 @@
#include "bio.h"
#include "mpath.h"
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 5869d6fdb17..06db326216f 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sd.c,v 1.273 2017/05/29 14:08:49 sf Exp $ */
+/* $OpenBSD: sd.c,v 1.274 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */
/*-
@@ -48,7 +48,6 @@
*/
#include <sys/stdint.h>
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index f311aa48762..3f88efd1c58 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: st.c,v 1.133 2017/05/29 07:47:13 krw Exp $ */
+/* $OpenBSD: st.c,v 1.134 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */
/*
@@ -54,7 +54,6 @@
* to be depending on whether we expect to retension or not.
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/timeout.h>
diff --git a/sys/scsi/uk.c b/sys/scsi/uk.c
index 4c27c06c6fd..e8a78b135bd 100644
--- a/sys/scsi/uk.c
+++ b/sys/scsi/uk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uk.c,v 1.18 2016/03/12 15:16:04 krw Exp $ */
+/* $OpenBSD: uk.c,v 1.19 2017/09/08 05:36:53 deraadt Exp $ */
/* $NetBSD: uk.c,v 1.15 1996/03/17 00:59:57 thorpej Exp $ */
/*
@@ -35,7 +35,6 @@
* Originally by Julian Elischer (julian@tfs.com)
*/
-#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/errno.h>