Don't include <sys/ioctl.h> in the kernel. Stage 1: don't include

it when it is not used.  In most cases, the reasons for including it
went away when the special ioctl headers became self-sufficient.

6 files changed, 6 insertions, 12 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ca5a311..976c37a 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.79 1997/03/23 03:37:23 bde Exp $
+ *      $Id: cd.c,v 1.80 1997/03/23 06:33:44 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -29,7 +29,6 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index 50bbb22..f8c5e57 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: ch.c,v 1.38 1997/03/23 04:39:12 bde Exp $
+ *      $Id: ch.c,v 1.39 1997/03/24 04:26:46 bde Exp $
  */
 
 #include "opt_scsi.h"
@@ -41,7 +41,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/chio.h>
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 3f80678..5f69a35 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.28 1997/02/22 09:44:26 peter Exp $
+ *	$Id: od.c,v 1.29 1997/03/23 06:33:45 bde Exp $
  */
 
 /*
@@ -68,7 +68,6 @@
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index 62db1de..c2c5138 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -15,7 +15,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  *
- *      $Id: sd.c,v 1.102 1997/02/22 09:44:37 peter Exp $
+ *      $Id: sd.c,v 1.103 1997/03/23 06:33:52 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -26,7 +26,6 @@
 #include <sys/kernel.h>
 #include <sys/dkbad.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/diskslice.h>
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 7292672..49bf3d0 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.76 1997/02/22 09:44:39 peter Exp $
+ * $Id: st.c,v 1.77 1997/03/23 06:33:53 bde Exp $
  */
 
 /*
@@ -37,7 +37,6 @@
 
 #include <sys/fcntl.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c
index c0d74b0..82a8fa2 100644
--- a/sys/scsi/worm.c
+++ b/sys/scsi/worm.c
@@ -43,7 +43,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: worm.c,v 1.33 1997/02/22 09:44:41 peter Exp $
+ *      $Id: worm.c,v 1.34 1997/03/23 06:33:55 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -53,7 +53,6 @@
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/wormio.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>