summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2006-10-12 12:48:21 +0000
committerjhb <jhb@FreeBSD.org>2006-10-12 12:48:21 +0000
commitfbcae8f09d778a29568965aab6a6b8036a7db9f0 (patch)
tree736c9a7ba5f2dc7f4d1ba5bc1afdfc15de3fe6c4 /sys/amd64
parentdc9cd76103b00c625db6314b6e5c1aa21bb11a55 (diff)
downloadFreeBSD-src-fbcae8f09d778a29568965aab6a6b8036a7db9f0.zip
FreeBSD-src-fbcae8f09d778a29568965aab6a6b8036a7db9f0.tar.gz
Fix nodevice atpic compile.
Pointy hat to: jhb
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/intr_machdep.c5
-rw-r--r--sys/amd64/amd64/machdep.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/amd64/amd64/intr_machdep.c b/sys/amd64/amd64/intr_machdep.c
index 65dd827..4495638 100644
--- a/sys/amd64/amd64/intr_machdep.c
+++ b/sys/amd64/amd64/intr_machdep.c
@@ -56,6 +56,11 @@
#include <ddb/ddb.h>
#endif
+#ifndef DEV_ATPIC
+#include <dev/ic/i8259.h>
+#include <amd64/isa/icu.h>
+#endif
+
#define MAX_STRAY_LOG 5
typedef void (*mask_fn)(void *);
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 6be2c82..d771323 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -125,9 +125,11 @@ __FBSDID("$FreeBSD$");
#include <machine/smp.h>
#endif
-#include <dev/ic/i8259.h>
+#ifdef DEV_ATPIC
#include <amd64/isa/icu.h>
+#else
#include <machine/apicvar.h>
+#endif
#include <isa/isareg.h>
#include <isa/rtc.h>
OpenPOWER on IntegriCloud