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, 24 deletions

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 */