diff options
| author | bde <bde@FreeBSD.org> | 2002-01-30 12:41:12 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2002-01-30 12:41:12 +0000 |
| commit | 337111499358fa39e9a0cf7c20e3e3a39a4602f3 (patch) | |
| tree | 5ccfbf2713a90f05c70f25f4708da5aa80f7057f /sys/i386/isa/npx.c | |
| parent | 5884b414e0e84f9c7b9f812571274e000a45b4af (diff) | |
| download | FreeBSD-src-337111499358fa39e9a0cf7c20e3e3a39a4602f3.zip FreeBSD-src-337111499358fa39e9a0cf7c20e3e3a39a4602f3.tar.gz | |
Don't include <isa/isavar.h> or compile code depending on it when isa
is not configured. Including <isa/isavar.h> when it is not used is
harmful as well as bogus, since it includes "isa_if.h" which is not
generated when isa is not configured.
This was fixed in 1999 but was broken by unconditionalizing PNPBIOS.
Diffstat (limited to 'sys/i386/isa/npx.c')
| -rw-r--r-- | sys/i386/isa/npx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c index 5d44aaa..07bd2f5 100644 --- a/sys/i386/isa/npx.c +++ b/sys/i386/isa/npx.c @@ -37,6 +37,7 @@ #include "opt_cpu.h" #include "opt_debug_npx.h" +#include "opt_isa.h" #include "opt_math_emulate.h" #include "opt_npx.h" @@ -83,7 +84,9 @@ #endif #endif #include <i386/isa/intr_machdep.h> +#ifdef DEV_ISA #include <isa/isavar.h> +#endif /* * 387 and 287 Numeric Coprocessor Extension (NPX) Driver. @@ -949,6 +952,7 @@ static driver_t npx_driver = { static devclass_t npx_devclass; +#ifdef DEV_ISA /* * We prefer to attach to the root nexus so that the usual case (exception 16) * doesn't describe the processor as being `on isa'. @@ -1003,4 +1007,4 @@ DRIVER_MODULE(npxisa, isa, npxisa_driver, npxisa_devclass, 0, 0); #ifndef PC98 DRIVER_MODULE(npxisa, acpi, npxisa_driver, npxisa_devclass, 0, 0); #endif - +#endif /* DEV_ISA */ |
