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

4 files changed, 0 insertions, 26 deletions

diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c
index f9c7726..1dffc0f 100644
--- a/sys/i4b/layer4/i4b_i4bdrv.c
+++ b/sys/i4b/layer4/i4b_i4bdrv.c
@@ -33,16 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "i4b.h"
 #include "i4bipr.h"
 #include "i4btel.h"
 
-#if NI4B > 1
-#error "only 1 (one) i4b device possible!"
-#endif
-
-#if NI4B > 0
-
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/malloc.h>
@@ -891,5 +884,3 @@ i4bputqueue_hipri(struct mbuf *m)
 		selwakeup(&select_rd_info);
 	}
 }
-
-#endif /* NI4B > 0 */
diff --git a/sys/i4b/layer4/i4b_l4.c b/sys/i4b/layer4/i4b_l4.c
index 517ee10..7b0616b 100644
--- a/sys/i4b/layer4/i4b_l4.c
+++ b/sys/i4b/layer4/i4b_l4.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "i4b.h"
 #include "i4bipr.h"
 
-#if NI4B > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -1102,5 +1099,3 @@ i4b_idle_check_var_unit(call_desc_t *cd)
 		break;
 	}
 }
-
-#endif /* NI4B > 0 */
diff --git a/sys/i4b/layer4/i4b_l4mgmt.c b/sys/i4b/layer4/i4b_l4mgmt.c
index 1368fb9..8556e37 100644
--- a/sys/i4b/layer4/i4b_l4mgmt.c
+++ b/sys/i4b/layer4/i4b_l4mgmt.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "i4b.h"
-
-#if NI4B > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -433,5 +429,3 @@ i4b_print_cdaa(void)
 }
 
 #endif /* I4B_CD_DEBUG_PRINT */
-
-#endif /* NI4BQ931 > 0 */
diff --git a/sys/i4b/layer4/i4b_l4timer.c b/sys/i4b/layer4/i4b_l4timer.c
index 327ad92..5be778d 100644
--- a/sys/i4b/layer4/i4b_l4timer.c
+++ b/sys/i4b/layer4/i4b_l4timer.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "i4b.h"
-
-#if NI4B > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -90,5 +86,3 @@ T400_stop(call_desc_t *cd)
 	CRIT_END;
 	NDBGL4(L4_MSG, "cr = %d", cd->cr);
 }
-
-#endif /* NI4B > 0 */