diff options
| author | Bruce Evans <bde@FreeBSD.org> | 2002-01-30 12:41:12 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 2002-01-30 12:41:12 +0000 |
| commit | 586079cc26331381dfb3c88ee0b996a1df7f8338 (patch) | |
| tree | 5ccfbf2713a90f05c70f25f4708da5aa80f7057f /sys/isa | |
| parent | c636c4a872a4f5cd7b898c7105ef490a3a4b649f (diff) | |
| download | src-586079cc26331381dfb3c88ee0b996a1df7f8338.tar.gz src-586079cc26331381dfb3c88ee0b996a1df7f8338.zip | |
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.
Notes
Notes:
svn path=/head/; revision=89980
Diffstat (limited to 'sys/isa')
| -rw-r--r-- | sys/isa/atrtc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index a39f7731be6a..ae5605117d10 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -49,6 +49,7 @@ */ #include "opt_clock.h" +#include "opt_isa.h" #include "opt_mca.h" #include <sys/param.h> @@ -83,7 +84,9 @@ #include <i386/isa/icu.h> #include <i386/isa/isa.h> #include <isa/rtc.h> +#ifdef DEV_ISA #include <isa/isavar.h> +#endif #include <i386/isa/timerreg.h> #include <i386/isa/intr_machdep.h> @@ -1260,6 +1263,7 @@ tsc_get_timecount(struct timecounter *tc) return (rdtsc()); } +#ifdef DEV_ISA /* * Attach to the ISA PnP descriptors for the timer and realtime clock. */ @@ -1306,3 +1310,4 @@ static devclass_t attimer_devclass; DRIVER_MODULE(attimer, isa, attimer_driver, attimer_devclass, 0, 0); DRIVER_MODULE(attimer, acpi, attimer_driver, attimer_devclass, 0, 0); +#endif /* DEV_ISA */ |