diff options
author | peter <peter@FreeBSD.org> | 1999-08-22 23:49:00 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-08-22 23:49:00 +0000 |
commit | 43510808c924e5951a2955c63b36337775950f43 (patch) | |
tree | 8f57e882054be4fd3e46c448f4b618b3e6b3ff64 | |
parent | 4fae91180410239629b2430dc918f04a2c302622 (diff) | |
download | FreeBSD-src-43510808c924e5951a2955c63b36337775950f43.zip FreeBSD-src-43510808c924e5951a2955c63b36337775950f43.tar.gz |
The previous fix didn't do anything if you didn't have pnp. The ICU
macros are only called in the !APIC_IO case, include icu.h there.
-rw-r--r-- | sys/amd64/amd64/autoconf.c | 5 | ||||
-rw-r--r-- | sys/i386/i386/autoconf.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 1969d30..1510138 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.134 1999/08/22 21:44:32 peter Exp $ + * $Id: autoconf.c,v 1.135 1999/08/22 23:44:33 green Exp $ */ /* @@ -70,11 +70,12 @@ #include <machine/md_var.h> #ifdef APIC_IO #include <machine/smp.h> +#else +#include <i386/isa/icu.h> #endif /* APIC_IO */ #include "pnp.h" #if NPNP > 0 -#include <i386/isa/icu.h> #include <i386/isa/isa_device.h> #include <i386/isa/pnp.h> #endif diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 1969d30..1510138 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.134 1999/08/22 21:44:32 peter Exp $ + * $Id: autoconf.c,v 1.135 1999/08/22 23:44:33 green Exp $ */ /* @@ -70,11 +70,12 @@ #include <machine/md_var.h> #ifdef APIC_IO #include <machine/smp.h> +#else +#include <i386/isa/icu.h> #endif /* APIC_IO */ #include "pnp.h" #if NPNP > 0 -#include <i386/isa/icu.h> #include <i386/isa/isa_device.h> #include <i386/isa/pnp.h> #endif |