Don't pull in <sys/file.h> just to get fcntl.h

ok deraadt@ krw@

16 files changed, 32 insertions, 32 deletions

diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index f70a4090c3c..aa095ac1109 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.124 2017/12/14 06:21:04 deraadt Exp $ */
+/*	$OpenBSD: wd.c,v 1.125 2017/12/30 23:08:29 guenther Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -62,7 +62,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/mutex.h>
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index ba3dfce322a..e0b1087265c 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.163 2017/04/30 16:45:46 mpi Exp $	*/
+/*	$OpenBSD: com.c,v 1.164 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -68,7 +68,7 @@
 #include <sys/selinfo.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
diff --git a/sys/dev/ic/wdc.c b/sys/dev/ic/wdc.c
index 3584b559e8f..8d3eb5b7d44 100644
--- a/sys/dev/ic/wdc.c
+++ b/sys/dev/ic/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.133 2017/09/26 22:12:04 mikeb Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.134 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: wdc.c,v 1.68 1999/06/23 19:00:17 bouyer Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -2032,7 +2032,7 @@ wdcbit_bucket(struct channel_softc *chp, int size)
 
 
 #include <sys/ataio.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 
 int wdc_ioc_ata_cmd(struct ata_drive_datas *, atareq_t *);
 
diff --git a/sys/dev/ic/z8530tty.c b/sys/dev/ic/z8530tty.c
index d9731e4ff80..08d513637f3 100644
--- a/sys/dev/ic/z8530tty.c
+++ b/sys/dev/ic/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.28 2017/04/30 13:04:49 mpi Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.29 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -100,7 +100,7 @@
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 0767e21c153..4ee21c1aa6e 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.105 2017/09/03 20:03:58 sf Exp $	*/
+/*	$OpenBSD: fd.c,v 1.106 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -45,7 +45,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
diff --git a/sys/dev/isa/spkr.c b/sys/dev/isa/spkr.c
index 26cc2434802..07311cb522b 100644
--- a/sys/dev/isa/spkr.c
+++ b/sys/dev/isa/spkr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spkr.c,v 1.21 2016/03/19 11:34:22 mpi Exp $	*/
+/*	$OpenBSD: spkr.c,v 1.22 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: spkr.c,v 1.1 1998/04/15 20:26:18 drochner Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
 #include <sys/uio.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 
 #include <dev/isa/pcppivar.h>
 
diff --git a/sys/dev/pcmcia/gpr.c b/sys/dev/pcmcia/gpr.c
index 46902793854..8180ac25f34 100644
--- a/sys/dev/pcmcia/gpr.c
+++ b/sys/dev/pcmcia/gpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpr.c,v 1.17 2016/03/14 23:08:06 krw Exp $	*/
+/*	$OpenBSD: gpr.c,v 1.18 2017/12/30 23:08:29 guenther Exp $	*/
 
 /*
  * Copyright (c) 2002, Federico G. Schwindt
@@ -39,7 +39,7 @@
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 
diff --git a/sys/dev/rd.c b/sys/dev/rd.c
index 8ddd5ff0264..7ca19cbbebc 100644
--- a/sys/dev/rd.c
+++ b/sys/dev/rd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rd.c,v 1.12 2015/09/11 20:43:23 dlg Exp $	*/
+/*	$OpenBSD: rd.c,v 1.13 2017/12/30 23:08:29 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 Matthew Dempsky <matthew@dempsky.org>
@@ -27,7 +27,7 @@
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/stat.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/dkio.h>
diff --git a/sys/dev/sbus/magma.c b/sys/dev/sbus/magma.c
index ff8ac99e596..22f9fe69683 100644
--- a/sys/dev/sbus/magma.c
+++ b/sys/dev/sbus/magma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: magma.c,v 1.26 2016/03/14 18:01:18 stefan Exp $	*/
+/*	$OpenBSD: magma.c,v 1.27 2017/12/30 23:08:29 guenther Exp $	*/
 
 /*-
  * Copyright (c) 1998 Iain Hibbert
@@ -36,7 +36,7 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/device.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/tty.h>
diff --git a/sys/dev/sbus/spif.c b/sys/dev/sbus/spif.c
index 260b8afbcdc..8f6c242f09e 100644
--- a/sys/dev/sbus/spif.c
+++ b/sys/dev/sbus/spif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spif.c,v 1.19 2010/07/02 17:27:01 nicm Exp $	*/
+/*	$OpenBSD: spif.c,v 1.20 2017/12/30 23:08:29 guenther Exp $	*/
 
 /*
  * Copyright (c) 1999-2002 Jason L. Wright (jason@thought.net)
@@ -41,7 +41,7 @@
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/errno.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/usb/uaudio.c b/sys/dev/usb/uaudio.c
index 863a106cf56..5cfb601376f 100644
--- a/sys/dev/usb/uaudio.c
+++ b/sys/dev/usb/uaudio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uaudio.c,v 1.127 2017/05/03 06:58:11 ratchov Exp $ */
+/*	$OpenBSD: uaudio.c,v 1.128 2017/12/30 23:08:29 guenther Exp $ */
 /*	$NetBSD: uaudio.c,v 1.90 2004/10/29 17:12:53 kent Exp $	*/
 
 /*
@@ -44,7 +44,7 @@
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/selinfo.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index b3c2043a3ce..88aa365399c 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ucom.c,v 1.65 2015/03/14 03:38:49 jsg Exp $ */
+/*	$OpenBSD: ucom.c,v 1.66 2017/12/30 23:08:29 guenther Exp $ */
 /*	$NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/selinfo.h>
 #include <sys/vnode.h>
 #include <sys/device.h>
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 27e910e874e..673dc465807 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ugen.c,v 1.96 2017/07/21 20:13:41 ians Exp $ */
+/*	$OpenBSD: ugen.c,v 1.97 2017/12/30 23:08:29 guenther Exp $ */
 /*	$NetBSD: ugen.c,v 1.63 2002/11/26 18:49:48 christos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -41,7 +41,7 @@
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/selinfo.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
diff --git a/sys/dev/usb/umidi.c b/sys/dev/usb/umidi.c
index 4d4c1b8ad9c..3f20e5f2c08 100644
--- a/sys/dev/usb/umidi.c
+++ b/sys/dev/usb/umidi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umidi.c,v 1.45 2017/04/08 02:57:25 deraadt Exp $	*/
+/*	$OpenBSD: umidi.c,v 1.46 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: umidi.c,v 1.16 2002/07/11 21:14:32 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/selinfo.h>
 #include <sys/poll.h>
 
diff --git a/sys/dev/usb/uvideo.c b/sys/dev/usb/uvideo.c
index 8abf1b47a56..007a6e92d38 100644
--- a/sys/dev/usb/uvideo.c
+++ b/sys/dev/usb/uvideo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvideo.c,v 1.195 2017/08/21 14:38:32 jsg Exp $ */
+/*	$OpenBSD: uvideo.c,v 1.196 2017/12/30 23:08:29 guenther Exp $ */
 
 /*
  * Copyright (c) 2008 Robert Nagy <robert@openbsd.org>
@@ -24,7 +24,7 @@
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/selinfo.h>
 #include <sys/lock.h>
 #include <sys/stat.h>
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index ba8db67155e..7fbb5107c4e 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnd.c,v 1.165 2017/07/19 14:54:29 deraadt Exp $	*/
+/*	$OpenBSD: vnd.c,v 1.166 2017/12/30 23:08:29 guenther Exp $	*/
 /*	$NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $	*/
 
 /*
@@ -59,7 +59,7 @@
 #include <sys/disk.h>
 #include <sys/stat.h>
 #include <sys/vnode.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/conf.h>
 #include <sys/dkio.h>