summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/if_cx.c
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1994-12-04 08:51:58 +0000
committerbde <bde@FreeBSD.org>1994-12-04 08:51:58 +0000
commit7e1c0b6246ed937cd20f60d43a352e42afb3e713 (patch)
tree64186bc5598ceeb9afd1ff0d423ab226ac14cce9 /sys/i386/isa/if_cx.c
parent4354fc94cd00b5579684f97aedd89d752050ae4e (diff)
downloadFreeBSD-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/if_cx.c')
-rw-r--r--sys/i386/isa/if_cx.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/i386/isa/if_cx.c b/sys/i386/isa/if_cx.c
index d6c0367..81bc7a3 100644
--- a/sys/i386/isa/if_cx.c
+++ b/sys/i386/isa/if_cx.c
@@ -20,11 +20,11 @@
#include "cx.h"
#if NCX > 0
-#include <bpfilter.h>
+#include "bpfilter.h"
#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/socket.h>
@@ -42,9 +42,8 @@
#ifdef __FreeBSD__
# include <i386/isa/isa_device.h>
# if __FreeBSD__ < 2
-# include <i386/include/pio.h>
+# include <machine/pio.h>
# else
-# include <i386/include/cpufunc.h>
# include <sys/devconf.h>
# endif
# define init_func_t void(*)(int)
@@ -61,7 +60,7 @@
# include <sys/device.h>
# include <i386/isa/isavar.h>
# include <i386/isa/icu.h>
-# include <i386/include/inline.h>
+# include <machine/inline.h>
# include <net/if_slvar.h>
# include <net/if_p2p.h>
# define timeout_func_t void(*)()
@@ -76,7 +75,7 @@ struct cxsoftc {
#endif
#include <net/if_sppp.h>
-#include <sys/cronyx.h>
+#include <machine/cronyx.h>
#include <i386/isa/cxreg.h>
#ifdef DEBUG
OpenPOWER on IntegriCloud