Eliminate a bunch of #include "pci.h" and #if NPCI > 0 around entire

files.  config will leave the whole file out if configured to do so.

39 files changed, 60 insertions, 217 deletions

diff --git a/sys/conf/files b/sys/conf/files
index f9fc9bc..5da5330 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3,12 +3,12 @@
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
-aicasm				optional	ahc			   \
+aicasm				optional ahc				   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
 	compile-with	"${MAKE} -f $S/dev/aic7xxx/Makefile MAKESRCPATH=$S/dev/aic7xxx" \
 	no-obj no-implicit-rule						   \
 	clean		"aicasm aicasm_gram.c aicasm_scan.c y.tab.h"
-aic7xxx_{seq,reg}.h		optional	ahc			   \
+aic7xxx_{seq,reg}.h		optional ahc				   \
 	compile-with	"./aicasm ${INCLUDES} -o aic7xxx_seq.h -r aic7xxx_reg.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"aic7xxx_seq.h aic7xxx_reg.h"			   \
@@ -300,7 +300,7 @@ kern/kern_timeout.c	standard
 kern/kern_xxx.c		standard
 kern/md5c.c		standard
 kern/subr_autoconf.c	standard
-kern/subr_bus.c			standard
+kern/subr_bus.c		standard
 kern/subr_devstat.c	standard
 kern/subr_diskslice.c	standard
 kern/subr_dkbad.c	standard
@@ -314,7 +314,7 @@ kern/subr_xxx.c		standard
 kern/sys_generic.c	standard
 kern/sys_pipe.c		standard
 kern/sys_process.c	standard
-kern/subr_rman.c		standard
+kern/subr_rman.c	standard
 kern/sys_socket.c	standard
 kern/sysv_ipc.c		standard
 kern/sysv_msg.c		optional sysvmsg
@@ -518,7 +518,7 @@ netinet/in_proto.c	optional inet
 netinet/in_rmx.c	optional inet
 netinet/ip_auth.c	optional ipfilter inet
 netinet/ip_divert.c	optional ipdivert
-netinet/ip_dummynet.c  optional dummynet
+netinet/ip_dummynet.c	optional dummynet
 netinet/ip_fil.c	optional ipfilter inet
 netinet/ip_flow.c	optional inet
 netinet/ip_frag.c	optional ipfilter inet
@@ -582,39 +582,39 @@ pccard/pccard.c		optional card
 pccard/pccard_beep.c	optional card
 pccard/pcic.c		optional pcic
 pci/amd.c		optional amd
-pci/pcic_p.c		optional pcic
-pci/adv_pci.c		optional adv
-pci/adw_pci.c		optional adw
-pci/ahc_pci.c		optional ahc 		\
+pci/pcic_p.c		optional pcic pci
+pci/adv_pci.c		optional adv pci
+pci/adw_pci.c		optional adw pci
+pci/ahc_pci.c		optional ahc pci		\
 	dependency	"aic7xxx_reg.h $S/pci/ahc_pci.c"
-pci/brooktree848.c	optional bktr
-pci/bt848_i2c.c		optional bktr
+pci/brooktree848.c	optional bktr pci
+pci/bt848_i2c.c		optional bktr pci
 pci/bt_pci.c		optional bt pci
-pci/cy_pci.c		optional cy
-pci/dpt_pci.c		optional pci dpt
-pci/ida_pci.c		optional ida
+pci/cy_pci.c		optional cy pci
+pci/dpt_pci.c		optional dpt pci
+pci/ida_pci.c		optional ida pci
 pci/if_al.c		optional al
 pci/if_ax.c		optional ax
 pci/if_de.c		optional de
-pci/if_ed_p.c		optional ed
-pci/if_en_pci.c		optional en
+pci/if_ed_p.c		optional ed pci
+pci/if_en_pci.c		optional en pci
 pci/if_fxp.c		optional fxp
-pci/if_lnc_p.c		optional lnc
+pci/if_lnc_p.c		optional lnc pci
 pci/if_mx.c		optional mx
 pci/if_pn.c		optional pn
-pci/if_fpa.c		optional fpa
+pci/if_fpa.c		optional fpa pci
 pci/if_rl.c		optional rl
-pci/if_sr_p.c		optional sr
+pci/if_sr_p.c		optional sr pci
 pci/if_ti.c		optional ti
 pci/if_tl.c		optional tl
 pci/if_tx.c		optional tx
 pci/if_vr.c		optional vr
-pci/if_vx_pci.c		optional vx
+pci/if_vx_pci.c		optional vx pci
 pci/if_wb.c		optional wb
 pci/if_xl.c		optional xl
 pci/isp_pci.c		optional isp
 pci/intpm.c		optional intpm
-pci/meteor.c		optional meteor
+pci/meteor.c		optional meteor pci
 pci/ncr.c		optional ncr
 pci/pci.c		optional pci
 pci/pci_compat.c	optional pci
diff --git a/sys/dev/advansys/adv_pci.c b/sys/dev/advansys/adv_pci.c
index 73b8622..4a669d0 100644
--- a/sys/dev/advansys/adv_pci.c
+++ b/sys/dev/advansys/adv_pci.c
@@ -47,11 +47,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
+ *	$Id: adv_pci.c,v 1.6 1999/05/09 17:06:35 peter Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -274,5 +272,3 @@ advpciattach(pcici_t config_id, int unit)
 	
 	adv_attach(adv);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/advansys/adw_pci.c b/sys/dev/advansys/adw_pci.c
index 85e7c92..8b0b86a 100644
--- a/sys/dev/advansys/adw_pci.c
+++ b/sys/dev/advansys/adw_pci.c
@@ -28,11 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
+ *	$Id: adw_pci.c,v 1.5 1999/05/09 17:06:36 peter Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -183,5 +181,3 @@ adwpciattach(pcici_t config_id, int unit)
 	
 	adw_attach(adw);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c
index dc8b7c6..bc4fd3f 100644
--- a/sys/dev/aic7xxx/ahc_pci.c
+++ b/sys/dev/aic7xxx/ahc_pci.c
@@ -34,11 +34,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.14 1999/05/25 20:12:32 gibbs Exp $
+ *	$Id: ahc_pci.c,v 1.15 1999/05/26 16:59:17 gibbs Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -1615,5 +1613,3 @@ ahc_aha398XX_setup(device_t dev, char *channel, ahc_chip *chip,
 	*flags |= AHC_LARGE_SEEPROM;
 	return (0);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index 23ccdea..1394def 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.85 1999/06/12 14:54:54 roger Exp $ */
+/* $Id: brooktree848.c,v 1.86 1999/06/13 16:05:00 roger Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -438,7 +438,6 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
 #include "bktr.h"
 #include "opt_bktr.h"
 #include "opt_devfs.h"
-#include "pci.h"
 #include "smbus.h"
 #endif /* __FreeBSD__ */
 
@@ -447,7 +446,7 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
 #define NSMBUS 0
 #endif 
 
-#if !defined(__FreeBSD__) || ((NBKTR > 0) && (NPCI > 0))
+#if !defined(__FreeBSD__) || (NBKTR > 0)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -7040,7 +7039,7 @@ static void msp_autodetect( bktr_ptr_t bktr ) {
     /* msp_write(bktr, 0x12, 0x0014, 0x7f40); */
 }
 
-#endif /* !defined(__FreeBSD__) || (NBKTR > 0 && NPCI > 0) */
+#endif /* !defined(__FreeBSD__) || (NBKTR > 0) */
 
 /* Local Variables: */
 /* mode: C */
diff --git a/sys/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c
index 8aa2de0..eec0642 100644
--- a/sys/dev/bktr/bktr_i2c.c
+++ b/sys/dev/bktr/bktr_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.3 1999/05/08 21:59:38 dfr Exp $
+ *	$Id: bt848_i2c.c,v 1.4 1999/05/10 10:08:05 roger Exp $
  *
  */
 
@@ -33,11 +33,10 @@
  * From brooktree848.c <fsmp@freefall.org>
  */
 
-#include "pci.h"
 #include "bktr.h"
 #include "smbus.h"
 
-#if (NBKTR > 0 && NPCI > 0 && NSMBUS > 0)
+#if (NBKTR > 0 && NSMBUS > 0)
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c
index b126364..e4f8669 100644
--- a/sys/dev/buslogic/bt_pci.c
+++ b/sys/dev/buslogic/bt_pci.c
@@ -26,11 +26,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.6 1999/04/23 23:30:22 gibbs Exp $
+ *	$Id: bt_pci.c,v 1.7 1999/05/08 21:59:38 dfr Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -230,5 +228,3 @@ static driver_t bt_pci_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, pci, bt_pci_driver, bt_devclass, 0, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c
index 3034dee..61848c3 100644
--- a/sys/dev/cy/cy_pci.c
+++ b/sys/dev/cy/cy_pci.c
@@ -24,16 +24,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.14 1999/05/09 17:06:43 peter Exp $
+ *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
  */
 
 /*
  * Cyclades Y PCI serial interface driver
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "opt_cy_pci_fastintr.h"
 
 #include <sys/param.h>
@@ -155,5 +152,3 @@ fail:
 	/* XXX should release any allocated virtual memory */
 	return;
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 3cd9f1d..f988a40 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $	*/
-/*	$Id: if_de.c,v 1.105 1999/05/09 17:06:49 peter Exp $ */
+/*	$Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -118,12 +118,9 @@
 #if defined(__FreeBSD__)
 #include <net/if_var.h>
 #include <vm/pmap.h>
-#include "pci.h"
-#if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
 #define	DEVAR_INCLUDE	"pci/if_devar.h"
-#endif
 #include "opt_bdg.h"
 #ifdef BRIDGE
 #include <net/bridge.h>
diff --git a/sys/dev/ed/if_ed_pci.c b/sys/dev/ed/if_ed_pci.c
index c96fa25..5f9d268 100644
--- a/sys/dev/ed/if_ed_pci.c
+++ b/sys/dev/ed/if_ed_pci.c
@@ -17,12 +17,9 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
+ *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -99,6 +96,3 @@ ed_pci_attach(config_id, unit)
 
 	return;
 }
-
-#endif /* NPCI > 0 */
-
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 4b8c865..0f0e3a7 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -46,8 +46,6 @@
  */
 
 #include "en.h"
-#include "pci.h"
-#if (NEN > 0) && (NPCI > 0)
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -435,5 +433,3 @@ eni_get_macaddr(scp)
 }
 
 #endif /* !MIDWAY_ADPONLY */
-
-#endif /* NEN > 0 && NPCI > 0 */
diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c
index 95af154..23446f1 100644
--- a/sys/dev/ida/ida_pci.c
+++ b/sys/dev/ida/ida_pci.c
@@ -23,12 +23,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ida_pci.c,v 1.1 1999/06/24 03:32:07 jlemon Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -195,5 +192,3 @@ ida_pci_print_child(device_t bus, device_t dev)
 }
 
 DRIVER_MODULE(ida, pci, ida_pci_driver, ida_devclass, 0, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/lnc/if_lnc_pci.c b/sys/dev/lnc/if_lnc_pci.c
index 0bdedd8..4e66bf1 100644
--- a/sys/dev/lnc/if_lnc_pci.c
+++ b/sys/dev/lnc/if_lnc_pci.c
@@ -17,12 +17,9 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.9 1999/05/09 17:06:55 peter Exp $
+ *	$Id: if_lnc_p.c,v 1.10 1999/05/10 22:39:37 paul Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -97,6 +94,3 @@ lnc_pci_attach(config_id, unit)
 
 	return;
 }
-
-#endif /* NPCI > 0 */
-
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index eb6abcc..9de789b 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -23,15 +23,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.108 1999/05/31 22:13:34 roger Exp $
+ * $Id: pci.c,v 1.109 1999/07/01 22:58:03 peter Exp $
  *
  */
 
 #include "opt_bus.h"
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "opt_devfs.h"
 #include "opt_simos.h"
 
@@ -1469,5 +1466,3 @@ static driver_t pci_driver = {
 };
 
 DRIVER_MODULE(pci, pcib, pci_driver, pci_devclass, pci_modevent, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/sr/if_sr_pci.c b/sys/dev/sr/if_sr_pci.c
index a7d34e9..260f5ef 100644
--- a/sys/dev/sr/if_sr_pci.c
+++ b/sys/dev/sr/if_sr_pci.c
@@ -27,12 +27,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
+ * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "sr.h"
 
 #include <sys/param.h>
@@ -130,5 +127,3 @@ sr_pci_attach(pcici_t config_id, int unit)
 		return;
 	}
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index c83b91b..0b0cec3 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.26 1999/05/09 17:07:02 peter Exp $ */
+/*	$Id: if_tx.c,v 1.27 1999/05/10 00:20:46 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -68,10 +68,8 @@
 	}
 
 #include "bpfilter.h"
-#include "pci.h"
 #include "opt_bdg.h"
 
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -2040,4 +2038,3 @@ epic_dump_state __P((
 		);
 	}
 }
-#endif /* NPCI > 0 */
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 1e6aa76..2bad3b0 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -29,9 +29,6 @@
  * $FreeBSD$
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "vx.h"
 #if NVX > 0
 
@@ -141,4 +138,3 @@ static struct pci_device vxdevice = {
 COMPAT_PCI_DRIVER (vx, vxdevice);
 
 #endif	/* NVX */
-#endif	/* NPCI */
diff --git a/sys/pccard/pcic_pci.c b/sys/pccard/pcic_pci.c
index c726aa9..e596a75 100644
--- a/sys/pccard/pcic_pci.c
+++ b/sys/pccard/pcic_pci.c
@@ -26,12 +26,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.11 1999/05/02 05:53:50 nate Exp $
+ * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -219,4 +216,3 @@ pd6832_legacy_init(pcici_t tag, int unit)
 		printf("CardBus: Legacy PC-card 16bit I/O address [0x%x]\n",
 		       io_port);
 }
-#endif /* NPCI > 0 */
diff --git a/sys/pci/adv_pci.c b/sys/pci/adv_pci.c
index 73b8622..4a669d0 100644
--- a/sys/pci/adv_pci.c
+++ b/sys/pci/adv_pci.c
@@ -47,11 +47,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adv_pci.c,v 1.5 1999/04/24 20:13:58 peter Exp $
+ *	$Id: adv_pci.c,v 1.6 1999/05/09 17:06:35 peter Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -274,5 +272,3 @@ advpciattach(pcici_t config_id, int unit)
 	
 	adv_attach(adv);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/adw_pci.c b/sys/pci/adw_pci.c
index 85e7c92..8b0b86a 100644
--- a/sys/pci/adw_pci.c
+++ b/sys/pci/adw_pci.c
@@ -28,11 +28,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: adw_pci.c,v 1.4 1999/04/24 20:13:58 peter Exp $
+ *	$Id: adw_pci.c,v 1.5 1999/05/09 17:06:36 peter Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -183,5 +181,3 @@ adwpciattach(pcici_t config_id, int unit)
 	
 	adw_attach(adw);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c
index dc8b7c6..bc4fd3f 100644
--- a/sys/pci/ahc_pci.c
+++ b/sys/pci/ahc_pci.c
@@ -34,11 +34,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ahc_pci.c,v 1.14 1999/05/25 20:12:32 gibbs Exp $
+ *	$Id: ahc_pci.c,v 1.15 1999/05/26 16:59:17 gibbs Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -1615,5 +1613,3 @@ ahc_aha398XX_setup(device_t dev, char *channel, ahc_chip *chip,
 	*flags |= AHC_LARGE_SEEPROM;
 	return (0);
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/alpm.c b/sys/pci/alpm.c
index d1bb5be..5027c20 100644
--- a/sys/pci/alpm.c
+++ b/sys/pci/alpm.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: alpm.c,v 1.3 1999/05/08 21:59:37 dfr Exp $
+ *	$Id: alpm.c,v 1.4 1999/05/09 17:06:38 peter Exp $
  *
  */
 
@@ -54,9 +54,6 @@
 #include "smbus_if.h"
 
 #include "alpm.h"
-#include "pci.h"
-
-#if (NALPM > 0 && NPCI > 0)
 
 #define ALPM_DEBUG(x)	if (alpm_debug) (x)
 
@@ -676,4 +673,3 @@ error:
 }
 
 DRIVER_MODULE(alsmb, root, alsmb_driver, alsmb_devclass, 0, 0);
-#endif
diff --git a/sys/pci/brooktree848.c b/sys/pci/brooktree848.c
index 23ccdea..1394def 100644
--- a/sys/pci/brooktree848.c
+++ b/sys/pci/brooktree848.c
@@ -1,4 +1,4 @@
-/* $Id: brooktree848.c,v 1.85 1999/06/12 14:54:54 roger Exp $ */
+/* $Id: brooktree848.c,v 1.86 1999/06/13 16:05:00 roger Exp $ */
 /* BT848 Driver for Brooktree's Bt848, Bt848A, Bt849A, Bt878, Bt879 based cards.
    The Brooktree  BT848 Driver driver is based upon Mark Tinguely and
    Jim Lowe's driver for the Matrox Meteor PCI card . The 
@@ -438,7 +438,6 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
 #include "bktr.h"
 #include "opt_bktr.h"
 #include "opt_devfs.h"
-#include "pci.h"
 #include "smbus.h"
 #endif /* __FreeBSD__ */
 
@@ -447,7 +446,7 @@ They are unrelated to Revision Control numbering of FreeBSD or any other system.
 #define NSMBUS 0
 #endif 
 
-#if !defined(__FreeBSD__) || ((NBKTR > 0) && (NPCI > 0))
+#if !defined(__FreeBSD__) || (NBKTR > 0)
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -7040,7 +7039,7 @@ static void msp_autodetect( bktr_ptr_t bktr ) {
     /* msp_write(bktr, 0x12, 0x0014, 0x7f40); */
 }
 
-#endif /* !defined(__FreeBSD__) || (NBKTR > 0 && NPCI > 0) */
+#endif /* !defined(__FreeBSD__) || (NBKTR > 0) */
 
 /* Local Variables: */
 /* mode: C */
diff --git a/sys/pci/bt848_i2c.c b/sys/pci/bt848_i2c.c
index 8aa2de0..eec0642 100644
--- a/sys/pci/bt848_i2c.c
+++ b/sys/pci/bt848_i2c.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt848_i2c.c,v 1.3 1999/05/08 21:59:38 dfr Exp $
+ *	$Id: bt848_i2c.c,v 1.4 1999/05/10 10:08:05 roger Exp $
  *
  */
 
@@ -33,11 +33,10 @@
  * From brooktree848.c <fsmp@freefall.org>
  */
 
-#include "pci.h"
 #include "bktr.h"
 #include "smbus.h"
 
-#if (NBKTR > 0 && NPCI > 0 && NSMBUS > 0)
+#if (NBKTR > 0 && NSMBUS > 0)
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/pci/bt_pci.c b/sys/pci/bt_pci.c
index b126364..e4f8669 100644
--- a/sys/pci/bt_pci.c
+++ b/sys/pci/bt_pci.c
@@ -26,11 +26,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: bt_pci.c,v 1.6 1999/04/23 23:30:22 gibbs Exp $
+ *	$Id: bt_pci.c,v 1.7 1999/05/08 21:59:38 dfr Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -230,5 +228,3 @@ static driver_t bt_pci_driver = {
 static devclass_t bt_devclass;
 
 DRIVER_MODULE(bt, pci, bt_pci_driver, bt_devclass, 0, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c
index 3034dee..61848c3 100644
--- a/sys/pci/cy_pci.c
+++ b/sys/pci/cy_pci.c
@@ -24,16 +24,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: cy_pci.c,v 1.14 1999/05/09 17:06:43 peter Exp $
+ *	$Id: cy_pci.c,v 1.15 1999/05/10 10:23:38 bde Exp $
  */
 
 /*
  * Cyclades Y PCI serial interface driver
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "opt_cy_pci_fastintr.h"
 
 #include <sys/param.h>
@@ -155,5 +152,3 @@ fail:
 	/* XXX should release any allocated virtual memory */
 	return;
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/ida_pci.c b/sys/pci/ida_pci.c
index 95af154..23446f1 100644
--- a/sys/pci/ida_pci.c
+++ b/sys/pci/ida_pci.c
@@ -23,12 +23,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: ida_pci.c,v 1.1 1999/06/24 03:32:07 jlemon Exp $
  */
 
-#include <pci.h>
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -195,5 +192,3 @@ ida_pci_print_child(device_t bus, device_t dev)
 }
 
 DRIVER_MODULE(ida, pci, ida_pci_driver, ida_devclass, 0, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 3cd9f1d..f988a40 100644
--- a/sys/pci/if_de.c
+++ b/sys/pci/if_de.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $	*/
-/*	$Id: if_de.c,v 1.105 1999/05/09 17:06:49 peter Exp $ */
+/*	$Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
 
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@@ -118,12 +118,9 @@
 #if defined(__FreeBSD__)
 #include <net/if_var.h>
 #include <vm/pmap.h>
-#include "pci.h"
-#if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
 #define	DEVAR_INCLUDE	"pci/if_devar.h"
-#endif
 #include "opt_bdg.h"
 #ifdef BRIDGE
 #include <net/bridge.h>
diff --git a/sys/pci/if_ed_p.c b/sys/pci/if_ed_p.c
index c96fa25..5f9d268 100644
--- a/sys/pci/if_ed_p.c
+++ b/sys/pci/if_ed_p.c
@@ -17,12 +17,9 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_ed_p.c,v 1.15 1999/04/24 20:14:00 peter Exp $
+ *	$Id: if_ed_p.c,v 1.16 1999/05/09 17:06:52 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -99,6 +96,3 @@ ed_pci_attach(config_id, unit)
 
 	return;
 }
-
-#endif /* NPCI > 0 */
-
diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c
index 4b8c865..0f0e3a7 100644
--- a/sys/pci/if_en_pci.c
+++ b/sys/pci/if_en_pci.c
@@ -46,8 +46,6 @@
  */
 
 #include "en.h"
-#include "pci.h"
-#if (NEN > 0) && (NPCI > 0)
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -435,5 +433,3 @@ eni_get_macaddr(scp)
 }
 
 #endif /* !MIDWAY_ADPONLY */
-
-#endif /* NEN > 0 && NPCI > 0 */
diff --git a/sys/pci/if_lnc_p.c b/sys/pci/if_lnc_p.c
index 0bdedd8..4e66bf1 100644
--- a/sys/pci/if_lnc_p.c
+++ b/sys/pci/if_lnc_p.c
@@ -17,12 +17,9 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: if_lnc_p.c,v 1.9 1999/05/09 17:06:55 peter Exp $
+ *	$Id: if_lnc_p.c,v 1.10 1999/05/10 22:39:37 paul Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -97,6 +94,3 @@ lnc_pci_attach(config_id, unit)
 
 	return;
 }
-
-#endif /* NPCI > 0 */
-
diff --git a/sys/pci/if_sr_p.c b/sys/pci/if_sr_p.c
index a7d34e9..260f5ef 100644
--- a/sys/pci/if_sr_p.c
+++ b/sys/pci/if_sr_p.c
@@ -27,12 +27,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: if_sr_p.c,v 1.8 1999/04/24 20:14:01 peter Exp $
+ * $Id: if_sr_p.c,v 1.9 1999/05/09 17:06:59 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "sr.h"
 
 #include <sys/param.h>
@@ -130,5 +127,3 @@ sr_pci_attach(pcici_t config_id, int unit)
 		return;
 	}
 }
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index c83b91b..0b0cec3 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $	*/
-/*	$Id: if_tx.c,v 1.26 1999/05/09 17:07:02 peter Exp $ */
+/*	$Id: if_tx.c,v 1.27 1999/05/10 00:20:46 peter Exp $ */
 
 /*-
  * Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@@ -68,10 +68,8 @@
 	}
 
 #include "bpfilter.h"
-#include "pci.h"
 #include "opt_bdg.h"
 
-#if NPCI > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
@@ -2040,4 +2038,3 @@ epic_dump_state __P((
 		);
 	}
 }
-#endif /* NPCI > 0 */
diff --git a/sys/pci/if_vx_pci.c b/sys/pci/if_vx_pci.c
index 1e6aa76..2bad3b0 100644
--- a/sys/pci/if_vx_pci.c
+++ b/sys/pci/if_vx_pci.c
@@ -29,9 +29,6 @@
  * $FreeBSD$
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "vx.h"
 #if NVX > 0
 
@@ -141,4 +138,3 @@ static struct pci_device vxdevice = {
 COMPAT_PCI_DRIVER (vx, vxdevice);
 
 #endif	/* NVX */
-#endif	/* NPCI */
diff --git a/sys/pci/intpm.c b/sys/pci/intpm.c
index 97fc71c..995cb2a 100644
--- a/sys/pci/intpm.c
+++ b/sys/pci/intpm.c
@@ -23,14 +23,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: intpm.c,v 1.9 1999/05/08 21:59:39 dfr Exp $
+ *	$Id: intpm.c,v 1.10 1999/05/09 09:56:43 phk Exp $
  */
 
-#include "pci.h"
-#include "intpm.h"
-
-#if NPCI > 0
-#if NINTPM >0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -760,5 +755,3 @@ static void intpm_intr(void *arg)
 	intsmb_intr(sc->smbus);
 	intsmb_slvintr(sc->smbus);
 }
-#endif /* NPCI > 0 */
-#endif
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index 804e2e7..f96c1e2 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -147,7 +147,6 @@
 
 #include "meteor.h"
 
-#if NMETEOR > 0
 #include "opt_devfs.h"
 #include "opt_meteor.h"
 
@@ -171,11 +170,8 @@
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 
-#include "pci.h"
-#if NPCI > 0
 #include <pci/pcivar.h>
 #include <pci/pcireg.h>
-#endif
 #include <machine/ioctl_meteor.h>
 #include <pci/meteor_reg.h>
 
@@ -2134,5 +2130,3 @@ meteor_mmap(dev_t dev, vm_offset_t offset, int nprot)
 
 	return i386_btop(vtophys(mtr->bigbuf) + offset);
 }
-
-#endif /* NMETEOR > 0 */
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index eb6abcc..9de789b 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -23,15 +23,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci.c,v 1.108 1999/05/31 22:13:34 roger Exp $
+ * $Id: pci.c,v 1.109 1999/07/01 22:58:03 peter Exp $
  *
  */
 
 #include "opt_bus.h"
 
-#include "pci.h"
-#if NPCI > 0
-
 #include "opt_devfs.h"
 #include "opt_simos.h"
 
@@ -1469,5 +1466,3 @@ static driver_t pci_driver = {
 };
 
 DRIVER_MODULE(pci, pcib, pci_driver, pci_devclass, pci_modevent, 0);
-
-#endif /* NPCI > 0 */
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index e97ad273..48ba902 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -23,15 +23,12 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pci_compat.c,v 1.28 1999/05/11 15:28:38 peter Exp $
+ * $Id: pci_compat.c,v 1.29 1999/05/31 22:13:36 roger Exp $
  *
  */
 
 #include "opt_bus.h"
 
-#include "pci.h"
-#if NPCI > 0
-
 /* for compatibility to FreeBSD-2.2 version of PCI code */
 
 #include <sys/param.h>
@@ -282,4 +279,3 @@ pci_get_bus_from_tag(pcici_t tag)
 }
 
 #endif /* PCI_COMPAT */
-#endif /* NPCI > 0 */
diff --git a/sys/pci/pcic_p.c b/sys/pci/pcic_p.c
index c726aa9..e596a75 100644
--- a/sys/pci/pcic_p.c
+++ b/sys/pci/pcic_p.c
@@ -26,12 +26,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: pcic_p.c,v 1.11 1999/05/02 05:53:50 nate Exp $
+ * $Id: pcic_p.c,v 1.12 1999/05/09 17:07:11 peter Exp $
  */
 
-#include "pci.h"
-#if NPCI > 0
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
@@ -219,4 +216,3 @@ pd6832_legacy_init(pcici_t tag, int unit)
 		printf("CardBus: Legacy PC-card 16bit I/O address [0x%x]\n",
 		       io_port);
 }
-#endif /* NPCI > 0 */