diff options
| author | peter <peter@FreeBSD.org> | 1999-07-03 18:34:04 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-07-03 18:34:04 +0000 |
| commit | 93cec9300e9768a5c7fa148bf093c8101c4f5f03 (patch) | |
| tree | 84a7c878e773994078b506b80e9829fe95f39a6e | |
| parent | 0a72bd402efd645c0ddaf79798d4fe2f6d738c0c (diff) | |
| download | FreeBSD-src-93cec9300e9768a5c7fa148bf093c8101c4f5f03.zip FreeBSD-src-93cec9300e9768a5c7fa148bf093c8101c4f5f03.tar.gz | |
Only have the pci component compiled if pci is specified at config.
Remove #if NPCI > 0 as a result.
| -rw-r--r-- | sys/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/i386/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/pci/es1370.c | 7 | ||||
| -rw-r--r-- | sys/pci/ide_pci.c | 5 |
4 files changed, 8 insertions, 16 deletions
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index e1b5854..acea105 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.250 1999/06/29 21:53:59 peter Exp $ +# $Id: files.i386,v 1.251 1999/07/03 18:26:22 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -382,5 +382,5 @@ libkern/strncmp.c standard libkern/strncpy.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard -pci/es1370.c optional pcm device-driver -pci/ide_pci.c optional wd device-driver +pci/es1370.c optional pcm pci device-driver +pci/ide_pci.c optional wd pci device-driver diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386 index e1b5854..acea105 100644 --- a/sys/i386/conf/files.i386 +++ b/sys/i386/conf/files.i386 @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $Id: files.i386,v 1.250 1999/06/29 21:53:59 peter Exp $ +# $Id: files.i386,v 1.251 1999/07/03 18:26:22 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -382,5 +382,5 @@ libkern/strncmp.c standard libkern/strncpy.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard -pci/es1370.c optional pcm device-driver -pci/ide_pci.c optional wd device-driver +pci/es1370.c optional pcm pci device-driver +pci/ide_pci.c optional wd pci device-driver diff --git a/sys/pci/es1370.c b/sys/pci/es1370.c index c5ac372..dff26f8 100644 --- a/sys/pci/es1370.c +++ b/sys/pci/es1370.c @@ -36,10 +36,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED * OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: es1370.c,v 1.4 1999/05/09 17:06:45 peter Exp $ + * $Id: es1370.c,v 1.5 1999/06/15 00:00:10 newton Exp $ */ -#include "pci.h" #include "pcm.h" #include <sys/param.h> @@ -56,8 +55,6 @@ #define DSP_ULAW_NOT_WANTED #include <i386/isa/snd/ulaw.h> -#if NPCI != 0 - /* -------------------------------------------------------------------- */ @@ -1124,5 +1121,3 @@ es_pci_attach(pcici_t config_id, int unit) return; } - -#endif /* NPCI != 0 */ diff --git a/sys/pci/ide_pci.c b/sys/pci/ide_pci.c index c5d0798..033f470 100644 --- a/sys/pci/ide_pci.c +++ b/sys/pci/ide_pci.c @@ -26,11 +26,9 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ide_pci.c,v 1.33 1999/04/24 20:13:58 peter Exp $ + * $Id: ide_pci.c,v 1.34 1999/05/09 17:06:47 peter Exp $ */ -#include "pci.h" -#if NPCI > 0 #include "wd.h" #if NWDC > 0 @@ -1935,4 +1933,3 @@ ide_pci_iobase(void *xcp) } #endif -#endif /* NPCI > 0 */ |
