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

49 files changed, 34 insertions, 281 deletions

diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c
index 2b310fe..b554aebce 100644
--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@@ -33,14 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-#include "iwic.h"
-#include "ifpi.h"
-#include "ifpi2.h"
-#include "ifpnp.h"
-#include "ihfc.h"
-#include "itjc.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
@@ -84,33 +76,19 @@
  
 unsigned int i4b_l1_debug = L1_DEBUG_DEFAULT;
 
-#if NISIC > 0
 static int l1isicunittab[MAXL1UNITS];
-#endif
 
-#if NIWIC > 0
 static int l1iwicunittab[MAXL1UNITS];
-#endif
 
-#if NIFPI > 0
 static int l1ifpiunittab[MAXL1UNITS];
-#endif
 
-#if NIFPI2 > 0
 static int l1ifpi2unittab[MAXL1UNITS];
-#endif
 
-#if NIHFC > 0
 static int l1ihfcunittab[MAXL1UNITS];
-#endif
 
-#if NIFPNP > 0
 static int l1ifpnpunittab[MAXL1UNITS];
-#endif
 
-#if NITJC > 0
 static int l1itjcunittab[MAXL1UNITS];
-#endif
 
 static int numl1units = 0;
 
@@ -167,41 +145,27 @@ getl1tab(int drv)
 {
 	switch(drv)
 	{
-#if NISIC > 0
 		case L1DRVR_ISIC:
 			return(l1isicunittab);
 			break;
-#endif
-#if NIWIC > 0
 		case L1DRVR_IWIC:
 			return(l1iwicunittab);
 			break;
-#endif
-#if NIFPI > 0
 		case L1DRVR_IFPI:
 			return(l1ifpiunittab);
 			break;
-#endif
-#if NIFPI2 > 0
 		case L1DRVR_IFPI2:
 			return(l1ifpi2unittab);
 			break;
-#endif
-#if NIHFC > 0
 		case L1DRVR_IHFC:
 			return(l1ihfcunittab);
 			break;
-#endif
-#if NIFPNP > 0
 		case L1DRVR_IFPNP:
 			return(l1ifpnpunittab);
 			break;
-#endif
-#if NITJC > 0
 		case L1DRVR_ITJC:
 			return(l1itjcunittab);
 			break;
-#endif
 		default:
 			return(NULL);
 			break;
@@ -310,41 +274,27 @@ i4b_l1_mph_status_ind(int drv_unit, int status, int parm, struct i4b_l1mux_func
 
 			switch(L0DRVR(drv_unit))
 			{
-#if NISIC > 0
 				case L1DRVR_ISIC:
 					printf("isic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NIWIC > 0
 				case L1DRVR_IWIC:
 					printf("iwic%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NIFPI > 0
 				case L1DRVR_IFPI:
 					printf("ifpi%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NIFPI2 > 0
 				case L1DRVR_IFPI2:
 					printf("ifpi2-%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NIFPNP > 0
 				case L1DRVR_IFPNP:
 					printf("ifpnp%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NIHFC > 0
 				case L1DRVR_IHFC:
 					printf("ihfc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
-#if NITJC > 0
 				case L1DRVR_ITJC:
 					printf("itjc%d: passive stack unit %d\n", L0UNIT(drv_unit), numl1units);
 					break;
-#endif
 			}
 			
 			NDBGL1(L1_PRIM, "ATTACH drv %d, drvunit %d -> unit %d", L0DRVR(drv_unit), L0UNIT(drv_unit), numl1units);
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index a9dd719..fc749f8 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -35,10 +35,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi.h"
-
-#if (NIFPI > 0)
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -661,5 +657,3 @@ ifpi_isac_init(struct l1_softc *sc)
 
 	return(0);
 }
-
-#endif /* NIFPI > 0 */
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index b384e45..418825d 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -35,10 +35,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi.h"
-
-#if (NIFPI > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -239,5 +235,3 @@ ifpi_mph_command_req(int unit, int command, void *parm)
 
 	return(0);
 }
-
-#endif /* NIFPI > 0 */
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index dd2e650..66c66a3 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -35,10 +35,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi.h"
-
-#if (NIFPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -512,5 +508,3 @@ ifpi_printstate(struct l1_softc *sc)
 	return((char *) state_text[sc->sc_I430state]);
 }
 #endif
-	
-#endif /* NIFPI > 0 */
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index a26f3eb..8ff860e 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -41,11 +41,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi.h"
 #include "opt_i4b.h"
 
-#if (NIFPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -1496,6 +1493,3 @@ ifpi_recover(struct l1_softc *sc)
 	DELAY(100);
 	ISAC_WRITE(I_MASK, ISAC_IMASK);
 }
-
-
-#endif /* NIFPI > 0 */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index 8c1bcd0..2550686 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -35,10 +35,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi2.h"
-
-#if (NIFPI2 > 0)
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -595,5 +591,3 @@ ifpi2_isacsx_init(struct l1_softc *sc)
 
 	return(0);
 }
-
-#endif /* NIFPI2 > 0 */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index 251cda7..2dad8b0 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -35,10 +35,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi2.h"
-
-#if (NIFPI2 > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -239,5 +235,3 @@ ifpi2_mph_command_req(int unit, int command, void *parm)
 
 	return(0);
 }
-
-#endif /* NIFPI2 > 0 */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
index 2cfdc21..7004e28 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -34,10 +34,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi2.h"
-
-#if (NIFPI2 > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -511,5 +507,3 @@ ifpi2_printstate(struct l1_softc *sc)
 	return((char *) state_text[sc->sc_I430state]);
 }
 #endif
-	
-#endif /* NIFPI2 > 0 */
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index 1adf4af..e0f855f 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -40,11 +40,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpi2.h"
 #include "opt_i4b.h"
 
-#if (NIFPI2 > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -1444,6 +1441,3 @@ ifpi2_recover(struct l1_softc *sc)
 	ISAC_WRITE(I_MASK, isacsx_imask);
 #endif
 }
-
-
-#endif /* NIFPI2 > 0 */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
index bb8c5f1..01cfc69 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c
@@ -39,11 +39,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpnp.h"
 #include "opt_i4b.h"
 
-#if (NIFPNP > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -1391,5 +1388,3 @@ ifpnp_recover(struct l1_softc *sc)
 	DELAY(100);
 	ISAC_WRITE(I_MASK, ISAC_IMASK);
 }
-
-#endif /* NIFPNP > 0 */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
index 83fe1bf..64b41f7 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c
@@ -36,10 +36,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpnp.h"
-
-#if (NIFPNP > 0)
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -662,5 +658,3 @@ ifpnp_isac_init(struct l1_softc *sc)
 
 	return(0);
 }
-
-#endif /* NIFPNP > 0 */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
index f2b4ad2..c7843d9 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c
@@ -36,10 +36,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpnp.h"
-
-#if (NIFPNP > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -240,5 +236,3 @@ ifpnp_mph_command_req(int unit, int command, void *parm)
 
 	return(0);
 }
-
-#endif /* NIFPNP > 0 */
diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
index 26b1540..d119717 100644
--- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
+++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c
@@ -36,10 +36,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ifpnp.h"
-
-#if (NIFPNP > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -513,5 +509,3 @@ ifpnp_printstate(struct l1_softc *sc)
 	return((char *) state_text[sc->sc_I430state]);
 }
 #endif
-	
-#endif /* NIFPNP > 0 */
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
index 14b4c80..16c8b9d 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c
@@ -36,10 +36,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ihfc.h"
-
-#if (NIHFC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -1761,5 +1757,3 @@ ihfc_test_Bread (ihfc_sc_t *sc, u_char chan)
 	S_HDLC_TMP = error;
 	S_HDLC_FLAG = ecount;
 }
-
-#endif /* NIHFC > 0 */
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
index 10c6395..11dc25a 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c
@@ -40,10 +40,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "ihfc.h"
-
-#if (NIHFC > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -513,5 +509,3 @@ ihfc_B_linkinit(ihfc_sc_t *sc)
 		S_BLINK.rx_mbuf    = &S_MBUFDUMMY;
 	}
 }
-
-#endif /* NIHFC > 0 */
diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
index ac5658b..f97f50d 100644
--- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
+++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c
@@ -39,10 +39,6 @@
  *     
  *---------------------------------------------------------------------------*/
 
-#include "ihfc.h"
-
-#if (NIHFC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -437,5 +433,3 @@ ihfc_pnp_detach (device_t dev, u_int flag)
 
 	return 0;
 }
-
-#endif /* NIHFC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
index 9d440b3..cf01aae 100644
--- a/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
+++ b/sys/i4b/layer1/isic/i4b_asuscom_ipac.c
@@ -46,10 +46,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined (ASUSCOM_IPAC)
+#if defined (ASUSCOM_IPAC)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -230,4 +229,4 @@ isic_attach_asi(device_t dev)
 
 	return(0);
 }
-#endif /* (NISIC > 0) && defined (ASUSCOM_IPAC) */
+#endif /* defined (ASUSCOM_IPAC) */
diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c
index 3fbfafb..6e747c8 100644
--- a/sys/i4b/layer1/isic/i4b_avm_a1.c
+++ b/sys/i4b/layer1/isic/i4b_avm_a1.c
@@ -41,10 +41,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(AVM_A1)
+#if defined(AVM_A1)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -407,4 +406,4 @@ isic_attach_avma1(device_t dev)
 	return(0);
 }
 
-#endif /* NISIC > 0 && defined(AVM_A1) */
+#endif /* defined(AVM_A1) */
diff --git a/sys/i4b/layer1/isic/i4b_bchan.c b/sys/i4b/layer1/isic/i4b_bchan.c
index 580e9a9..39d2847 100644
--- a/sys/i4b/layer1/isic/i4b_bchan.c
+++ b/sys/i4b/layer1/isic/i4b_bchan.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -399,5 +395,3 @@ isic_init_linktab(struct l1_softc *sc)
 	/* used by HDLC data transfers, i.e. ipr and isp drivers */	
 	lt->rx_mbuf = &chan->in_mbuf;	
 }
- 
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_ctx_s0P.c b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
index 5e0f210..96ad4c6 100644
--- a/sys/i4b/layer1/isic/i4b_ctx_s0P.c
+++ b/sys/i4b/layer1/isic/i4b_ctx_s0P.c
@@ -40,10 +40,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610))
+#if (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610))
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -312,5 +311,5 @@ isic_attach_Cs0P(device_t dev)
 	return 0;
 }
 
-#endif /* (NISIC > 0) && (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610)) */
+#endif /* (defined(CRTX_S0_P) || defined(TEL_S0_16_3_P) || defined(COMPAQ_M610)) */
 
diff --git a/sys/i4b/layer1/isic/i4b_diva.c b/sys/i4b/layer1/isic/i4b_diva.c
index 0177961..811e091 100644
--- a/sys/i4b/layer1/isic/i4b_diva.c
+++ b/sys/i4b/layer1/isic/i4b_diva.c
@@ -33,10 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined EICON_DIVA
+#if defined EICON_DIVA
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -395,4 +394,4 @@ isic_attach_diva(device_t dev)
 	return(0);
 }
 
-#endif /* NISIC > 0 && defined EICON_DIVA */
+#endif /* defined EICON_DIVA */
diff --git a/sys/i4b/layer1/isic/i4b_drn_ngo.c b/sys/i4b/layer1/isic/i4b_drn_ngo.c
index ae9b589..0cb4cfa 100644
--- a/sys/i4b/layer1/isic/i4b_drn_ngo.c
+++ b/sys/i4b/layer1/isic/i4b_drn_ngo.c
@@ -33,10 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(DRN_NGO)
+#if defined(DRN_NGO)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -257,4 +256,4 @@ isic_attach_drnngo(device_t dev)
 	return (0);
 }
 
-#endif /* (NISIC > 0) && defined(DRN_NGO) */
+#endif /* defined(DRN_NGO) */
diff --git a/sys/i4b/layer1/isic/i4b_dynalink.c b/sys/i4b/layer1/isic/i4b_dynalink.c
index 3ed0aea..fc40124 100644
--- a/sys/i4b/layer1/isic/i4b_dynalink.c
+++ b/sys/i4b/layer1/isic/i4b_dynalink.c
@@ -67,10 +67,9 @@
 	This driver might also work for Asuscom cards.
 */
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(DYNALINK)
+#if defined(DYNALINK)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -230,4 +229,4 @@ isic_attach_Dyn(device_t dev)
 	return 0;                
 }
 
-#endif /* (NISIC > 0) && defined(DYNALINK) */
+#endif /* defined(DYNALINK) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
index f7fb3d5..0d2521a 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c
@@ -33,10 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(ELSA_PCC16)
+#if defined(ELSA_PCC16)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -388,4 +387,4 @@ isic_attach_Epcc16(device_t dev)
 	return 0;
 }
 
-#endif /* (NISIC > 0) && defined(ELSA_PCC16) */
+#endif /* defined(ELSA_PCC16) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
index 9b184e9..b6980fc 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1i.c
@@ -33,10 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(ELSA_QS1ISA)
+#if defined(ELSA_QS1ISA)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -234,4 +233,4 @@ isic_attach_Eqs1pi(device_t dev)
 
 	return 0;
 }
-#endif /* (NISIC > 0) && defined(ELSA_QS1ISA) */
+#endif /* defined(ELSA_QS1ISA) */
diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
index 85169d9..03bd9a4 100644
--- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
+++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c
@@ -35,10 +35,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(ELSA_QS1PCI)
+#if defined(ELSA_QS1PCI)
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -349,4 +348,4 @@ eqs1p_pci_attach(device_t dev)
 	return(0);
 }
 
-#endif /* (NISIC > 0) && && defined(ELSA_QS1PCI) */
+#endif /* defined(ELSA_QS1PCI) */
diff --git a/sys/i4b/layer1/isic/i4b_hscx.c b/sys/i4b/layer1/isic/i4b_hscx.c
index 03eb3c4..30dd0bd 100644
--- a/sys/i4b/layer1/isic/i4b_hscx.c
+++ b/sys/i4b/layer1/isic/i4b_hscx.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -649,5 +645,3 @@ isic_hscx_waitxfw(struct l1_softc *sc, int h_chan)
 		NDBGL1(L1_H_XFRERR, "HSCX wait for XFW time: %d uS", (WAITTO-timeout)*50);
 	}
 }
-		
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isac.c b/sys/i4b/layer1/isic/i4b_isac.c
index f66aaa0..1bdf331 100644
--- a/sys/i4b/layer1/isic/i4b_isac.c
+++ b/sys/i4b/layer1/isic/i4b_isac.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-
-#if NISIC > 0
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -656,5 +652,3 @@ isic_isac_init(struct l1_softc *sc)
 
 	return(0);
 }
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isic.c b/sys/i4b/layer1/isic/i4b_isic.c
index 751c568..56fe733 100644
--- a/sys/i4b/layer1/isic/i4b_isic.c
+++ b/sys/i4b/layer1/isic/i4b_isic.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -494,6 +491,3 @@ isic_detach_common(device_t dev)
 		}
 	}
 }
-
-#endif /* NISIC > 0 */
-
diff --git a/sys/i4b/layer1/isic/i4b_isic_isa.c b/sys/i4b/layer1/isic/i4b_isic_isa.c
index 87c9f04..2f60c22 100644
--- a/sys/i4b/layer1/isic/i4b_isic_isa.c
+++ b/sys/i4b/layer1/isic/i4b_isic_isa.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -206,4 +203,3 @@ isic_isa_attach(device_t dev)
 
 	return(ret);
 }
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c
index f5e1bcc..dc6c70c 100644
--- a/sys/i4b/layer1/isic/i4b_isic_pnp.c
+++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c
@@ -43,11 +43,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -327,4 +324,3 @@ isic_pnp_attach(device_t dev)
 		return 0;
 	}
 }
-#endif /* (NISIC > 0) */
diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c
index cccee81..6158b2b 100644
--- a/sys/i4b/layer1/isic/i4b_itk_ix1.c
+++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c
@@ -60,10 +60,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(ITKIX1)
+#if defined(ITKIX1)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -394,4 +393,4 @@ isic_attach_itkix1(device_t dev)
 	return 0;
 }
 
-#endif /* ITKIX1 */
+#endif /* defined(ITKIX1) */
diff --git a/sys/i4b/layer1/isic/i4b_l1.c b/sys/i4b/layer1/isic/i4b_l1.c
index d68a480..623b2ef 100644
--- a/sys/i4b/layer1/isic/i4b_l1.c
+++ b/sys/i4b/layer1/isic/i4b_l1.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -250,5 +246,3 @@ isic_mph_command_req(int unit, int command, void *parm)
 
 	return(0);
 }
-
-#endif /* NISIC > 0 */
diff --git a/sys/i4b/layer1/isic/i4b_l1fsm.c b/sys/i4b/layer1/isic/i4b_l1fsm.c
index 11c261d..5c64996 100644
--- a/sys/i4b/layer1/isic/i4b_l1fsm.c
+++ b/sys/i4b/layer1/isic/i4b_l1fsm.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
-
-#if NISIC > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -507,6 +503,3 @@ isic_printstate(struct l1_softc *sc)
 	return((char *) state_text[sc->sc_I430state]);
 }
 #endif
-	
-#endif /* NISIC > 0 */
-
diff --git a/sys/i4b/layer1/isic/i4b_siemens_isurf.c b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
index d846d43..4f1e746 100644
--- a/sys/i4b/layer1/isic/i4b_siemens_isurf.c
+++ b/sys/i4b/layer1/isic/i4b_siemens_isurf.c
@@ -42,10 +42,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(SIEMENS_ISURF2)
+#if defined(SIEMENS_ISURF2)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -227,4 +226,4 @@ isic_attach_siemens_isurf(device_t dev)
 
 	return(0);
 }
-#endif /* NISIC > 0 && defined(SIEMENS_ISURF2) */
+#endif /* defined(SIEMENS_ISURF2) */
diff --git a/sys/i4b/layer1/isic/i4b_sws.c b/sys/i4b/layer1/isic/i4b_sws.c
index cfe9372..e239660 100644
--- a/sys/i4b/layer1/isic/i4b_sws.c
+++ b/sys/i4b/layer1/isic/i4b_sws.c
@@ -50,10 +50,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if defined (SEDLBAUER) && NISIC > 0
+#if defined (SEDLBAUER)
 
 #define SWS_RESON  0 /* reset on                 */
 #define SWS_RESOFF 1 /* reset off                */
@@ -209,4 +208,4 @@ isic_attach_sws(device_t dev)
 
 	return(0);
 }
-#endif /* defined(SEDLBAUER) && NISIC > 0 */
+#endif /* defined(SEDLBAUER) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c
index 4e2b67f..b84da2c 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s016.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s016.c
@@ -43,10 +43,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(TEL_S0_16)
+#if defined(TEL_S0_16)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -367,4 +366,5 @@ isic_attach_s016(device_t dev)
 
 	return 0;
 }
-#endif /* ISIC > 0 */
+
+#endif /* defined(TEL_S0_16) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c
index 150306d..6a567b7 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s0163.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c
@@ -43,10 +43,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(TEL_S0_16_3)
+#if defined(TEL_S0_16_3)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -371,5 +370,4 @@ isic_attach_s0163(device_t dev)
 	return (0);
 }
 
-#endif /* ISIC > 0 */
-
+#endif /* defined(TEL_S0_16_3) */
diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c
index d1d69b2..a789e66 100644
--- a/sys/i4b/layer1/isic/i4b_tel_s08.c
+++ b/sys/i4b/layer1/isic/i4b_tel_s08.c
@@ -43,10 +43,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if NISIC > 0 && defined(TEL_S0_8)
+#if defined(TEL_S0_8)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -300,4 +299,5 @@ isic_attach_s08(device_t dev)
 
 	return 0;
 }
-#endif /* ISIC > 0 */
+
+#endif /* defined(TEL_S0_8) */
diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c
index 4a3a0e0..cd15948 100644
--- a/sys/i4b/layer1/isic/i4b_usr_sti.c
+++ b/sys/i4b/layer1/isic/i4b_usr_sti.c
@@ -33,10 +33,9 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "isic.h"
 #include "opt_i4b.h"
 
-#if (NISIC > 0) && defined(USR_STI)
+#if defined(USR_STI)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -495,4 +494,4 @@ isic_attach_usrtai(device_t dev)
 	return (0);
 }
 
-#endif /* ISIC > 0 */
+#endif /* defined(USR_STI) */
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_isac.c b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
index 8ff79cb..07718a6 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_isac.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_isac.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "itjc.h"
-
-#if (NITJC > 0)
-
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -547,5 +543,3 @@ itjc_isac_init(struct l1_softc *sc)
 
 	return(0);
 }
-
-#endif /* NITJC > 0 */
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1.c b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
index 76b8ef5..98ffba8 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "itjc.h"
-
-#if (NITJC > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -238,5 +234,3 @@ itjc_mph_command_req(int unit, int command, void *parm)
 
 	return(0);
 }
-
-#endif /* NITJC > 0 */
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
index afb1bc6..663d111 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c
@@ -33,10 +33,6 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "itjc.h"
-
-#if (NITJC > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -515,5 +511,3 @@ itjc_printstate(struct l1_softc *sc)
 	return((char *) state_text[sc->sc_I430state]);
 }
 #endif
-	
-#endif /* NITJC > 0 */
diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
index ad5d45b..4a13ee2 100644
--- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c
+++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c
@@ -39,11 +39,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "itjc.h"
 #include "opt_i4b.h"
 
-#if (NITJC > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -2131,5 +2128,3 @@ itjc_recover(struct l1_softc *sc)
 	DELAY(100);
 	ISAC_WRITE(I_MASK, ISAC_IMASK);
 }
-
-#endif /* NITJC > 0 */
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
index 2b5ac66..89595c2 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_bchan.c
@@ -35,11 +35,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
 #include "opt_i4b.h"
 
-#if (NIWIC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -768,5 +765,3 @@ iwic_init_linktab(struct iwic_softc *sc)
 	/* used by HDLC data transfers, i.e. ipr and isp drivers */	
 	lt->rx_mbuf = &chan->in_mbuf;	
 }
- 
-#endif /* NIWIC > 0 */
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
index 68cede6..ebee109 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_dchan.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
 #include "opt_i4b.h"
 
-#if (NIWIC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -468,5 +465,3 @@ iwic_dchan_transmit(struct iwic_softc *sc)
 	sc->sc_dchan.tx_ready = 0;
 	IWIC_WRITE(sc, D_CMDR, cmd);
 }
-
-#endif	/* (NIWIC > 0) */
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
index 79faa29..6d316f6 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_fsm.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
 #include "opt_i4b.h"
 
-#if (NIWIC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -223,5 +220,3 @@ iwic_printstate(struct iwic_softc *sc)
 	return((char *)state_names[sc->sc_I430state]);
 }
 #endif
-  
-#endif
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
index 359502f..7d465da 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_l1if.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
 #include "opt_i4b.h"
 
-#if (NIWIC > 0)
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
@@ -148,5 +145,3 @@ iwic_set_linktab (int unit, int channel, drvr_link_t *dlt)
 
 	bchan->iwic_drvr_linktab = dlt;
 }
-
-#endif
diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
index 175295c..53e0510 100644
--- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c
+++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c
@@ -33,11 +33,8 @@
  *
  *---------------------------------------------------------------------------*/
 
-#include "iwic.h"
 #include "opt_i4b.h"
 
-#if (NIWIC > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -312,5 +309,3 @@ iwic_pci_intr(struct iwic_softc *sc)
 		}
 	}
 }
-
-#endif