diff options
author | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-03-23 03:37:54 +0000 |
commit | 0d3591bdbd3a026b25e6400f8cc2717489321ee5 (patch) | |
tree | 6f29bb8eda668548be86212b07bea087a25e6b3d /sys/dev | |
parent | 9c1cce114fbef8364b2d49669b0215e8bac94fd3 (diff) | |
download | FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.zip FreeBSD-src-0d3591bdbd3a026b25e6400f8cc2717489321ee5.tar.gz |
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.
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/cy/cy.c | 4 | ||||
-rw-r--r-- | sys/dev/cy/cy_isa.c | 4 | ||||
-rw-r--r-- | sys/dev/dgb/dgb.c | 4 | ||||
-rw-r--r-- | sys/dev/fdc/fdc.c | 4 | ||||
-rw-r--r-- | sys/dev/mcd/mcd.c | 4 | ||||
-rw-r--r-- | sys/dev/rc/rc.c | 2 | ||||
-rw-r--r-- | sys/dev/si/si.c | 4 | ||||
-rw-r--r-- | sys/dev/sio/sio.c | 4 | ||||
-rw-r--r-- | sys/dev/snp/snp.c | 2 | ||||
-rw-r--r-- | sys/dev/vn/vn.c | 4 |
10 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 1bbc540..54443dc 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $ */ #include "cy.h" @@ -76,7 +76,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/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 1bbc540..54443dc 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $ */ #include "cy.h" @@ -76,7 +76,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/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index af4fcc2..10f7728 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id$ + * dgb.c $Id: dgb.c,v 1.23 1997/02/22 09:29:42 peter Exp $ * * Digiboard driver. * @@ -50,7 +50,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/sysctl.h> diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index e08c637..b18ad71 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id$ + * $Id: fd.c,v 1.97 1997/02/22 09:36:09 peter 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/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 4fa6086..d48add7 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id$ + * $Id: mcd.c,v 1.85 1997/02/22 09:36:53 peter Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -50,7 +50,7 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/stat.h> diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 677ae14..5a2ce2c 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -44,7 +44,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/syslog.h> diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index c2ae76c..0fa4bfb 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.c,v 1.55 1997/02/22 09:37:06 peter Exp $ */ #ifndef lint @@ -46,7 +46,7 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/ttydefaults.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/dkstat.h> #include <sys/kernel.h> diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 0c835f0..896812e 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id$ + * $Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,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/dev/snp/snp.c b/sys/dev/snp/snp.c index 0e14b60..fbb6f91 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -23,7 +23,7 @@ #include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */ #include <sys/proc.h> #include <sys/tty.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/kernel.h> diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index e1011ff..f2936c9 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id$ + * $Id: vn.c,v 1.44 1997/02/22 09:28:58 peter Exp $ */ /* @@ -79,7 +79,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/vnode.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/disklabel.h> #include <sys/diskslice.h> |