From fe10481de8102b5c0f2b7fea777b318cdb6f0603 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sun, 23 Mar 1997 03:49:00 +0000
Subject: [PATCH] Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is
 defined. Fixed everything that depended on getting fcntl.h stuff from the
 wrong place.  Most things don't depend on file.h stuff at all.

---
 sys/pc98/cbus/fdc.c | 4 ++--
 sys/pc98/cbus/sio.c | 4 ++--
 sys/pc98/pc98/fd.c  | 4 ++--
 sys/pc98/pc98/sio.c | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c
index a545f787173e..b6c1b7e650da 100644
--- a/sys/pc98/cbus/fdc.c
+++ b/sys/pc98/cbus/fdc.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.16 1997/02/22 09:43:34 peter Exp $
+ *	$Id: fd.c,v 1.17 1997/03/04 06:39:02 kato Exp $
  *
  */
 
@@ -59,7 +59,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c
index acd1528e839a..53dc54dbfb19 100644
--- a/sys/pc98/cbus/sio.c
+++ b/sys/pc98/cbus/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.17 1997/02/22 09:43:44 peter Exp $
+ *	$Id: sio.c,v 1.18 1997/03/06 15:07:04 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -125,7 +125,7 @@
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c
index a545f787173e..b6c1b7e650da 100644
--- a/sys/pc98/pc98/fd.c
+++ b/sys/pc98/pc98/fd.c
@@ -43,7 +43,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)fd.c	7.4 (Berkeley) 5/25/91
- *	$Id: fd.c,v 1.16 1997/02/22 09:43:34 peter Exp $
+ *	$Id: fd.c,v 1.17 1997/03/04 06:39:02 kato Exp $
  *
  */
 
@@ -59,7 +59,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <machine/clock.h>
 #include <machine/ioctl_fd.h>
diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c
index acd1528e839a..53dc54dbfb19 100644
--- a/sys/pc98/pc98/sio.c
+++ b/sys/pc98/pc98/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.17 1997/02/22 09:43:44 peter Exp $
+ *	$Id: sio.c,v 1.18 1997/03/06 15:07:04 kato Exp $
  */
 
 #include "opt_comconsole.h"
@@ -125,7 +125,7 @@
 #include <sys/proc.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
-#include <sys/file.h>
+#include <sys/fcntl.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>