From fbcae8f09d778a29568965aab6a6b8036a7db9f0 Mon Sep 17 00:00:00 2001
From: jhb <jhb@FreeBSD.org>
Date: Thu, 12 Oct 2006 12:48:21 +0000
Subject: Fix nodevice atpic compile.

Pointy hat to:	jhb
---
 sys/amd64/amd64/intr_machdep.c | 5 +++++
 sys/amd64/amd64/machdep.c      | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'sys/amd64')

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>
-- 
cgit v1.1