aboutsummaryrefslogtreecommitdiff
path: root/sys/i4b
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-09-03 20:38:47 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-09-03 20:38:47 +0000
commit9d38d41c0260755ebdeee0b5e87ac422e1c578ff (patch)
tree7bb6a59ffe3979b8b9b2564cc6a3d54db8819d87 /sys/i4b
parent4c2212401b0cd7047043ef42171a74956707a606 (diff)
Notes
Diffstat (limited to 'sys/i4b')
-rw-r--r--sys/i4b/layer1/i4b_ctx_s0P.c2
-rw-r--r--sys/i4b/layer1/i4b_dynalink.c2
-rw-r--r--sys/i4b/layer1/i4b_elsa_qs1i.c2
-rw-r--r--sys/i4b/layer1/i4b_isic_pnp.c7
4 files changed, 9 insertions, 4 deletions
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index a651d6bf7d84..d2ec03f3c306 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -97,7 +97,7 @@ void isic_attach_Cs0P(struct isic_softc *sc);
#endif
#ifdef __FreeBSD__
-#include <i386/isa/pnp.h>
+/* #include <i386/isa/pnp.h> */
extern void isicintr ( int unit );
#endif
diff --git a/sys/i4b/layer1/i4b_dynalink.c b/sys/i4b/layer1/i4b_dynalink.c
index 1e586ae002a4..676ed03432fb 100644
--- a/sys/i4b/layer1/i4b_dynalink.c
+++ b/sys/i4b/layer1/i4b_dynalink.c
@@ -107,7 +107,7 @@
#endif
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
+/* #include <i386/isa/pnp.h> */
#elif defined(__bsdi__)
#include <i386/isa/pnp.h>
#else
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index 1dea51d676d6..f77d7bbff054 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -67,7 +67,7 @@
#endif
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
+/* #include <i386/isa/pnp.h> */
#else
#include <machine/bus.h>
#include <sys/device.h>
diff --git a/sys/i4b/layer1/i4b_isic_pnp.c b/sys/i4b/layer1/i4b_isic_pnp.c
index e83061a7eb42..753b8ed4ac8e 100644
--- a/sys/i4b/layer1/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/i4b_isic_pnp.c
@@ -49,6 +49,11 @@
#include "isic.h"
#include "opt_i4b.h"
+#if NPNP > 0
+#warning "Fix i4b pnp!"
+#undef NPNP
+#endif
+
#if (NISIC > 0) && (NPNP > 0)
#include <sys/param.h>
@@ -70,7 +75,7 @@ extern void isicintr(int unit);
#include <machine/clock.h>
#include <i386/isa/isa_device.h>
-#include <i386/isa/pnp.h>
+/* #include <i386/isa/pnp.h> */
#include <i4b/include/i4b_global.h>
#include <machine/i4b_ioctl.h>