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

diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index f68eff7..9664e3b 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -27,9 +27,6 @@
  * $FreeBSD$
  */
 
-#include "i4bcapi.h"
-#if NI4BCAPI > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -446,5 +443,3 @@ n_download(int unit, int numprotos, struct isdn_dr_prot *protocols)
 
     return(0);
 }
-
-#endif /* NI4BCAPI > 0 */
diff --git a/sys/i4b/capi/capi_llif.c b/sys/i4b/capi/capi_llif.c
index a022861..37ba967 100644
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@@ -27,9 +27,6 @@
  * $FreeBSD$
  */
 
-#include "i4bcapi.h"
-#if NI4BCAPI > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -162,5 +159,3 @@ capi_ll_receive(capi_softc_t *sc, struct mbuf *m)
     i4b_Dfreembuf(m);
     return(0);
 }
-
-#endif /* NI4BCAPI > 0*/
diff --git a/sys/i4b/capi/capi_msgs.c b/sys/i4b/capi/capi_msgs.c
index 5c1698f..e2031ec 100644
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@@ -27,9 +27,6 @@
  * $FreeBSD$
  */
 
-#include "i4bcapi.h"
-#if NI4BCAPI > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -949,5 +946,3 @@ void capi_disconnect_ind(capi_softc_t *sc, struct mbuf *m_in)
 
     sc->send(sc, m);
 }
-
-#endif /* NI4BCAPI > 0 */
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index 70bb66f..da2b671 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -28,11 +28,6 @@
  * $FreeBSD$
  */
 
-#include "iavc.h"
-#include "i4bcapi.h"
-
-#if (NIAVC > 0) && (NI4BCAPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -287,5 +282,3 @@ void t1_reset(iavc_softc_t *sc)
     iavc_write_port(sc, T1_IRQMASTER, 0x00);
     iavc_write_port(sc, T1_RESETBOARD, 0x0f);
 }
-
-#endif
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index b1d53be..1027f28 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -25,11 +25,6 @@
  * $FreeBSD$
  */
 
-#include "iavc.h"
-#include "i4bcapi.h"
-
-#if (NIAVC > 0) && (NI4BCAPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -293,5 +288,3 @@ iavc_isa_intr(struct iavc_softc *sc)
 {
 	iavc_handle_intr(sc);
 }
-
-#endif
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index 26af86a..b29254c 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -28,11 +28,6 @@
  * $FreeBSD$
  */
 
-#include "iavc.h"
-#include "i4bcapi.h"
-
-#if (NIAVC > 0) && (NI4BCAPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -830,5 +825,3 @@ static void iavc_start_tx(iavc_softc_t *sc)
 	    AMCC_WRITE(sc, AMCC_INTCSR, sc->sc_csr);
     }
 }
-
-#endif
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index 8162f98..8cef025 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -28,11 +28,6 @@
  * $FreeBSD$
  */
 
-#include "iavc.h"
-#include "i4bcapi.h"
-
-#if (NIAVC > 0) && (NI4BCAPI > 0)
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -277,5 +272,3 @@ iavc_pci_intr(struct iavc_softc *sc)
 {
     iavc_handle_intr(sc);
 }
-
-#endif