Continue de-counting i4b. Devices i4bctl, i4bcapi, iavc, i4bq921,

i4bq931, i4b, isic, iwic, ifpi, ifpi2, ifpnp, ihfc, and itjc are
no longer count devices.  Also remove a few other instances of N<DEVICE>
being used to control compilation of whole files.

Reviewed by:    hm

7 files changed, 0 insertions, 34 deletions

diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index ad32408..bafe362 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -33,14 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "i4bctl.h"
-
-#if NI4BCTL > 1
-#error "only 1 (one) i4bctl device allowed!"
-#endif
-
-#if NI4BCTL > 0
-
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/kernel.h>
@@ -240,5 +232,3 @@ i4bctlpoll (dev_t dev, int events, struct thread *td)
 {
 	return (ENODEV);
 }
-
-#endif /* NI4BCTL > 0 */
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index c82dabc..ec4eeb7 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -35,8 +35,6 @@
 
 #include "i4bing.h"
 
-#if NI4BING > 0
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -864,5 +862,3 @@ ng_ing_disconnect(hook_p hook)
 }
 
 /*===========================================================================*/
-
-#endif /* NI4BING > 0 */
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index e86a9cb..f8283c2 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -58,8 +58,6 @@
 
 #include "i4bipr.h"
 
-#if NI4BIPR > 0
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -1033,5 +1031,3 @@ ipr_init_linktab(int unit)
 }
 
 /*===========================================================================*/
-
-#endif /* NI4BIPR > 0 */
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 5a922e3..8485f23 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -42,10 +42,6 @@
 
 #include "i4bisppp.h"
 
-#if NI4BISPPP == 0
-# error "You need to define `device sppp <N>' with options ISPPP"
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index ae5ed80..3b85c9a 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -35,8 +35,6 @@
 
 #include "i4brbch.h"
 
-#if NI4BRBCH > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -846,5 +844,3 @@ rbch_init_linktab(int unit)
 }
 
 /*===========================================================================*/
-
-#endif /* NI4BRBCH > 0 */
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index e8513db3..22a1dc1 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -35,8 +35,6 @@
 
 #include "i4btel.h"
 
-#if NI4BTEL > 0
-
 #undef I4BTELDEBUG
 
 #include <sys/param.h>
@@ -1686,5 +1684,3 @@ static u_char sinetab[8000] = { 213, 213, 213, 213, 213, 213, 213, 212,
 84, 84, 84, 84, 85, 85, 85, 85, 85, 85, 90, 90, 90 };
 
 /*===========================================================================*/
-
-#endif /* NI4BTEL > 0 */
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index ebfc277..2fc2443 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -37,8 +37,6 @@
 
 #include "i4btrc.h"
 
-#if NI4BTRC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioccom.h>
@@ -451,5 +449,3 @@ i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 	}
 	return(error);
 }
-
-#endif /* NI4BTRC > 0 */