diff options
| author | peter <peter@FreeBSD.org> | 2001-01-29 09:38:39 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-01-29 09:38:39 +0000 |
| commit | b7edc4f4e3e8a67e435d794319102a67c59af546 (patch) | |
| tree | 1281145cc84b32bb59314a3b88e848f48901c103 /sys/amd64/amd64/autoconf.c | |
| parent | 2c6ef92d83b54b2a2a2203ee3860bc46a6c56341 (diff) | |
| download | FreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.zip FreeBSD-src-b7edc4f4e3e8a67e435d794319102a67c59af546.tar.gz | |
Send "#if NISA > 0" to the bit-bucket and replace it with an option.
These were compile-time "is the isa code present?" tests and not
'how many isa busses' tests.
Diffstat (limited to 'sys/amd64/amd64/autoconf.c')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 8e41c826..eb8eb8d 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -48,13 +48,12 @@ #include "opt_bootp.h" #include "opt_ffs.h" #include "opt_cd9660.h" +#include "opt_isa.h" #include "opt_nfs.h" #include "opt_nfsroot.h" #include "opt_bus.h" #include "opt_rootdevname.h" -#include "isa.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -76,7 +75,7 @@ #include <i386/isa/icu.h> #endif /* APIC_IO */ -#if NISA > 0 +#ifdef DEV_ISA #include <isa/isavar.h> device_t isa_bus_device = 0; @@ -145,7 +144,7 @@ configure(dummy) /* initialize new bus architecture */ root_bus_configure(); -#if NISA > 0 +#ifdef DEV_ISA /* * Explicitly probe and attach ISA last. The isa bus saves * it's device node at attach time for us here. |
