diff options
| author | bde <bde@FreeBSD.org> | 1994-12-04 08:51:58 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-12-04 08:51:58 +0000 |
| commit | 7e1c0b6246ed937cd20f60d43a352e42afb3e713 (patch) | |
| tree | 64186bc5598ceeb9afd1ff0d423ab226ac14cce9 /sys/i386/isa/cx.c | |
| parent | 4354fc94cd00b5579684f97aedd89d752050ae4e (diff) | |
| download | FreeBSD-src-7e1c0b6246ed937cd20f60d43a352e42afb3e713.zip FreeBSD-src-7e1c0b6246ed937cd20f60d43a352e42afb3e713.tar.gz | |
Fix bogus and broken include paths:
<string.h> isn't supposed to be used by the kernel.
cronix.h is <machine/cronix.h>, not "cronyx.h" (ambiguous) or
<sys/cronyx.h> (nonexistent; caused compile to fail).
cxreg.h is <i386/isa/cxreg.h>, not "cxreg.h".
<i386/isa/cpufunc.h> shouldn't be included directly; it is always
included by <sys/systm.h>.
<i386/include/*.h> is <machine/*.h>
<systm.h> is <sys/systm.h>.
<kernel.h> is <sys/kernel.h>.
<bpfilter.h> is "bpfilter.h". It really is in the current directory.
Diffstat (limited to 'sys/i386/isa/cx.c')
| -rw-r--r-- | sys/i386/isa/cx.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 80ecaa7..f1729b6 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -21,8 +21,8 @@ #if NCX > 0 #include <sys/param.h> -#include <systm.h> -#include <kernel.h> +#include <sys/systm.h> +#include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/ioctl.h> #include <sys/file.h> @@ -36,17 +36,16 @@ #ifdef __FreeBSD__ # if __FreeBSD__ < 2 -# include <i386/include/pio.h> +# include <machine/pio.h> # define RB_GETC(q) getc(q) # else /* BSD 4.4 Lite */ -# include <i386/include/cpufunc.h> # include <sys/devconf.h> # endif # define oproc_func_t void(*)(struct tty*) #endif #ifdef __bsdi__ # include <sys/ttystats.h> -# include <i386/include/inline.h> +# include <machine/inline.h> # define tsleep(tp,pri,msg,x) ((tp)->t_state |= TS_WOPEN,\ ttysleep (tp, (caddr_t)&tp->t_rawq, pri, msg, x)) # define oproc_func_t int(*)() @@ -60,7 +59,7 @@ # define TSA_OLOWAT(q) ((caddr_t)&(q)->t_out) #endif -#include <sys/cronyx.h> +#include <machine/cronyx.h> #include <i386/isa/cxreg.h> #ifdef DEBUG |
