summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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