Index: conf/files
===================================================================
RCS file: /home/ncvs/src/sys/conf/files,v
retrieving revision 1.667
diff -u -r1.667 files
--- conf/files	20 Jul 2002 02:56:09 -0000	1.667
+++ conf/files	20 Jul 2002 17:55:54 -0000
@@ -287,7 +287,7 @@
 dev/bge/if_bge.c	optional bge
 dev/bktr/bktr_audio.c	optional bktr pci
 dev/bktr/bktr_card.c	optional bktr pci
-dev/bktr/bktr_core.c	count bktr pci
+dev/bktr/bktr_core.c	optional bktr pci
 dev/bktr/bktr_i2c.c	optional bktr pci smbus
 dev/bktr/bktr_os.c	optional bktr pci
 dev/bktr/bktr_tuner.c	optional bktr pci
@@ -473,7 +473,7 @@
 dev/pci/fixup_pci.c	optional pci
 dev/pci/ignore_pci.c	optional pci
 dev/pci/isa_pci.c	optional pci
-dev/pci/pci.c		count pci
+dev/pci/pci.c		optional pci
 dev/pci/pci_if.m	standard
 dev/pci/pci_pci.c	optional pci
 dev/pci/pci_user.c	optional pci
@@ -529,7 +529,7 @@
 dev/smbus/smbus_if.m	optional smbus
 dev/smbus/smb.c		optional smb
 dev/smbus/smbconf.c	optional smbus
-dev/smbus/smbus.c	count smbus
+dev/smbus/smbus.c	optional smbus
 dev/sn/if_sn.c		optional sn
 dev/sn/if_sn_isa.c	optional sn isa
 dev/sn/if_sn_pccard.c	optional sn card
Index: conf/options
===================================================================
RCS file: /home/ncvs/src/sys/conf/options,v
retrieving revision 1.337
diff -u -r1.337 options
--- conf/options	15 Jul 2002 19:11:21 -0000	1.337
+++ conf/options	20 Jul 2002 17:54:08 -0000
@@ -261,6 +261,7 @@
 ATAPI_DEBUG		opt_ata.h
 ATA_DEBUG		opt_ata.h
 ATA_STATIC_ID		opt_ata.h
+ATA_NOPCI		opt_ata.h
 DEV_ATADISK		opt_ata.h
 DEV_ATAPICD		opt_ata.h
 DEV_ATAPIST		opt_ata.h
Index: dev/aic7xxx/aic79xx_osm.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/aic7xxx/aic79xx_osm.h,v
retrieving revision 1.2
diff -u -r1.2 aic79xx_osm.h
--- dev/aic7xxx/aic79xx_osm.h	6 Jun 2002 16:35:57 -0000	1.2
+++ dev/aic7xxx/aic79xx_osm.h	20 Jul 2002 17:51:55 -0000
@@ -38,9 +38,6 @@
 #define _AIC79XX_FREEBSD_H_
 
 #include <opt_aic79xx.h>	/* for config options */
-#ifndef NPCI
-#include <pci.h>
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,10 +57,8 @@
 
 #include <sys/rman.h>
 
-#if NPCI > 0
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
-#endif
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
Index: dev/aic7xxx/aic7xxx_osm.h
===================================================================
RCS file: /home/ncvs/src/sys/dev/aic7xxx/aic7xxx_osm.h,v
retrieving revision 1.14
diff -u -r1.14 aic7xxx_osm.h
--- dev/aic7xxx/aic7xxx_osm.h	26 Apr 2002 22:48:20 -0000	1.14
+++ dev/aic7xxx/aic7xxx_osm.h	20 Jul 2002 17:52:06 -0000
@@ -38,9 +38,6 @@
 #define _AIC7XXX_FREEBSD_H_
 
 #include <opt_aic7xxx.h>	/* for config options */
-#ifndef NPCI
-#include <pci.h>
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -51,12 +48,10 @@
 #include <sys/malloc.h>
 #include <sys/queue.h>
 
-#if NPCI > 0
 #define AHC_PCI_CONFIG 1
 #ifdef AHC_ALLOW_MEMIO
 #include <machine/bus_memio.h>
 #endif
-#endif
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
 #include <machine/endian.h>
@@ -65,10 +60,8 @@
 
 #include <sys/rman.h>
 
-#if NPCI > 0
 #include <pci/pcireg.h>
 #include <pci/pcivar.h>
-#endif
 
 #include <cam/cam.h>
 #include <cam/cam_ccb.h>
Index: dev/ata/ata-isa.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ata/ata-isa.c,v
retrieving revision 1.6
diff -u -r1.6 ata-isa.c
--- dev/ata/ata-isa.c	18 Apr 2002 19:11:45 -0000	1.6
+++ dev/ata/ata-isa.c	20 Jul 2002 18:08:03 -0000
@@ -28,6 +28,8 @@
  * $FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.6 2002/04/18 19:11:45 sos Exp $
  */
 
+#include "opt_ata.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -105,8 +107,7 @@
  * the following is a bandaid to get ISA only setups to link,
  * since these are getting rare the ugliness is kept here
  */
-#include "pci.h"
-#if NPCI == 0
+#ifdef ATA_NOPCI
 int
 ata_dmaalloc(struct ata_device *atadev)
 {
@@ -134,9 +135,10 @@
     return -1;
 }
 
-void
+int
 ata_dmastart(struct ata_device *atadev, caddr_t data, int32_t count, int dir)
 {
+    return -1;
 }
 
 int
Index: dev/bktr/bktr_core.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/bktr/bktr_core.c,v
retrieving revision 1.119
diff -u -r1.119 bktr_core.c
--- dev/bktr/bktr_core.c	24 May 2002 05:21:36 -0000	1.119
+++ dev/bktr/bktr_core.c	20 Jul 2002 08:31:03 -0000
@@ -96,12 +96,8 @@
 
 #include "opt_bktr.h"		/* Include any kernel config options */
 
-#ifdef __FreeBSD__
-#include "bktr.h"
-#endif /* __FreeBSD__ */
-
 #if (                                                            \
-       (defined(__FreeBSD__) && (NBKTR > 0))                     \
+       (defined(__FreeBSD__))                                    \
     || (defined(__bsdi__))                                       \
     || (defined(__OpenBSD__))                                    \
     || (defined(__NetBSD__))                                     \
Index: dev/bktr/bktr_i2c.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/bktr/bktr_i2c.c,v
retrieving revision 1.21
diff -u -r1.21 bktr_i2c.c
--- dev/bktr/bktr_i2c.c	25 Mar 2002 21:22:33 -0000	1.21
+++ dev/bktr/bktr_i2c.c	20 Jul 2002 08:31:16 -0000
@@ -35,8 +35,6 @@
 
 #include "opt_bktr.h"
 
-#include "bktr.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
Index: dev/bktr/bktr_os.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/bktr/bktr_os.c,v
retrieving revision 1.27
diff -u -r1.27 bktr_os.c
--- dev/bktr/bktr_os.c	25 Mar 2002 21:22:33 -0000	1.27
+++ dev/bktr/bktr_os.c	20 Jul 2002 08:31:48 -0000
@@ -48,10 +48,6 @@
  */
 
 
-#ifdef __FreeBSD__
-#include "bktr.h"
-#endif /* __FreeBSD__ */
-
 #include "opt_bktr.h"		/* include any kernel config options */
 
 #define FIFO_RISC_DISABLED      0
@@ -840,6 +836,8 @@
 /**********************************/
 
 #if ((__FreeBSD__ == 2) || (__FreeBSD__ == 3))
+
+#include "bktr.h"
 
 static bktr_reg_t brooktree[ NBKTR ];
 
Index: dev/buslogic/bt.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/buslogic/bt.c,v
retrieving revision 1.32
diff -u -r1.32 bt.c
--- dev/buslogic/bt.c	13 Dec 2001 11:14:28 -0000	1.32
+++ dev/buslogic/bt.c	20 Jul 2002 17:54:32 -0000
@@ -53,10 +53,7 @@
  *     attempt to perform memory mapped I/O.
  */
 #if 0
-#include "pci.h"
-#if NPCI > 0
 #include <machine/bus_memio.h>
-#endif
 #endif
 #include <machine/bus_pio.h>
 #include <machine/bus.h>
Index: dev/lmc/if_lmc.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/lmc/if_lmc.c,v
retrieving revision 1.15
diff -u -r1.15 if_lmc.c
--- dev/lmc/if_lmc.c	2 Jun 2002 20:05:44 -0000	1.15
+++ dev/lmc/if_lmc.c	20 Jul 2002 17:56:35 -0000
@@ -53,7 +53,6 @@
 #include <netgraph/netgraph.h>
 
 #include <vm/pmap.h>
-#include <pci.h>
 #include <pci/pcivar.h>
 #include <pci/dc21040reg.h>
 #define INCLUDE_PATH_PREFIX "dev/lmc/"
Index: i386/isa/stallion.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/stallion.c,v
retrieving revision 1.49
diff -u -r1.49 stallion.c
--- i386/isa/stallion.c	1 Apr 2002 21:30:42 -0000	1.49
+++ i386/isa/stallion.c	20 Jul 2002 17:55:29 -0000
@@ -54,12 +54,10 @@
 #include <i386/isa/ic/scd1400.h>
 #include <machine/comstats.h>
 
-#include "pci.h"
 #ifdef COMPILING_LINT
 #warning "The stallion pci device is broken and not compiled with LINT"
-#undef NPCI
-#define NPCI 0
 #endif
+#define NPCI 0
 #if NPCI > 0
 #ifndef COMPAT_OLDPCI
 #error "The stallion pci driver requires the old pci compatibility shims"