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/nmi.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/nmi.c')
| -rw-r--r-- | sys/i386/isa/nmi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 3d20f9f..98194a1 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -148,6 +148,7 @@ static void init_i8259(void); #define ENMI_IOSTATUS (1 << 5) #endif +#ifdef DEV_ISA /* * Bus attachment for the ISA PIC. */ @@ -212,6 +213,7 @@ static devclass_t atpic_devclass; DRIVER_MODULE(atpic, isa, atpic_driver, atpic_devclass, 0, 0); DRIVER_MODULE(atpic, acpi, atpic_driver, atpic_devclass, 0, 0); +#endif /* DEV_ISA */ /* * Handle a NMI, possibly a machine check. |
