aboutsummaryrefslogtreecommitdiff
path: root/sys/i4b
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-12-07 12:06:31 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-12-07 12:06:31 +0000
commit136018cbbefd2bd152675fc0e917864a80287ced (patch)
treec63ad8d1ba513c565aba710b80750c3122a5cfb0 /sys/i4b
parent0be01624315368ccf8659fa0d99edf54379e60f6 (diff)
downloadsrc-136018cbbefd2bd152675fc0e917864a80287ced.tar.gz
src-136018cbbefd2bd152675fc0e917864a80287ced.zip
Temporary adjustment to build after pnp changes. There is a new version
in the pipeline apparently. OK'ed by: hm
Notes
Notes: svn path=/head/; revision=54259
Diffstat (limited to 'sys/i4b')
-rw-r--r--sys/i4b/layer1/i4b_asuscom_ipac.c3
-rw-r--r--sys/i4b/layer1/i4b_ctx_s0P.c4
-rw-r--r--sys/i4b/layer1/i4b_drn_ngo.c4
-rw-r--r--sys/i4b/layer1/i4b_dynalink.c4
-rw-r--r--sys/i4b/layer1/i4b_elsa_qs1i.c4
-rw-r--r--sys/i4b/layer1/i4b_isic_pnp.c2
6 files changed, 10 insertions, 11 deletions
diff --git a/sys/i4b/layer1/i4b_asuscom_ipac.c b/sys/i4b/layer1/i4b_asuscom_ipac.c
index 59f4211d7dd1..670e2178dc33 100644
--- a/sys/i4b/layer1/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/i4b_asuscom_ipac.c
@@ -48,11 +48,10 @@
#if defined(__FreeBSD__)
#include "isic.h"
#include "opt_i4b.h"
-#include "pnp.h"
#else
#define NISIC 1
-#define NPNP 1
#endif
+#define NPNP 1
#if (NISIC > 0) && (NPNP > 0) && defined(ASUSCOM_IPAC)
diff --git a/sys/i4b/layer1/i4b_ctx_s0P.c b/sys/i4b/layer1/i4b_ctx_s0P.c
index d2ec03f3c306..5a9eb32a528e 100644
--- a/sys/i4b/layer1/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/i4b_ctx_s0P.c
@@ -37,15 +37,15 @@
#include "isic.h"
#include "opt_i4b.h"
-#include "pnp.h"
#else
#define NISIC 1
-#define NPNP 1
#endif
+#define NPNP 1
+
#if (NISIC > 0) && (NPNP > 0) && defined(CRTX_S0_P)
#include <sys/param.h>
diff --git a/sys/i4b/layer1/i4b_drn_ngo.c b/sys/i4b/layer1/i4b_drn_ngo.c
index cca3a5b91277..0e5346e28cd1 100644
--- a/sys/i4b/layer1/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/i4b_drn_ngo.c
@@ -37,15 +37,15 @@
#include "isic.h"
#include "opt_i4b.h"
-#include "pnp.h"
#else
#define NISIC 1
-#define NPNP 1
#endif
+#define NPNP 1
+
#if (NISIC > 0) && (NPNP > 0) && defined(DRN_NGO)
#include <sys/param.h>
diff --git a/sys/i4b/layer1/i4b_dynalink.c b/sys/i4b/layer1/i4b_dynalink.c
index 676ed03432fb..ff9d0e5e6470 100644
--- a/sys/i4b/layer1/i4b_dynalink.c
+++ b/sys/i4b/layer1/i4b_dynalink.c
@@ -78,15 +78,15 @@
#include "isic.h"
#include "opt_i4b.h"
-#include "pnp.h"
#else
#define NISIC 1
-#define NPNP 1
#endif
+#define NPNP 1
+
#if (NISIC > 0) && (NPNP > 0) && defined(DYNALINK)
/* HEADERS
diff --git a/sys/i4b/layer1/i4b_elsa_qs1i.c b/sys/i4b/layer1/i4b_elsa_qs1i.c
index f77d7bbff054..88bb6a77e7bf 100644
--- a/sys/i4b/layer1/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/i4b_elsa_qs1i.c
@@ -37,15 +37,15 @@
#include "isic.h"
#include "opt_i4b.h"
-#include "pnp.h"
#else
#define NISIC 1
-#define NPNP 1
#endif
+#define NPNP 1
+
/*
* this driver works for both the ELSA QuickStep 1000 PNP and the ELSA
* PCC-16
diff --git a/sys/i4b/layer1/i4b_isic_pnp.c b/sys/i4b/layer1/i4b_isic_pnp.c
index 753b8ed4ac8e..5153105ea59a 100644
--- a/sys/i4b/layer1/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/i4b_isic_pnp.c
@@ -45,7 +45,7 @@
#ifdef __FreeBSD__
-#include "pnp.h"
+#define NPNP 1
#include "isic.h"
#include "opt_i4b.h"