summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/amd64/i8259.c10
-rw-r--r--sys/arch/amd64/isa/clock.c9
2 files changed, 2 insertions, 17 deletions
diff --git a/sys/arch/amd64/amd64/i8259.c b/sys/arch/amd64/amd64/i8259.c
index 4cea529bde2..c53eaedc329 100644
--- a/sys/arch/amd64/amd64/i8259.c
+++ b/sys/arch/amd64/amd64/i8259.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i8259.c,v 1.2 2004/06/25 11:03:27 art Exp $ */
+/* $OpenBSD: i8259.c,v 1.3 2005/12/10 02:08:04 krw Exp $ */
/* $NetBSD: i8259.c,v 1.2 2003/03/02 18:27:15 fvdl Exp $ */
/*
@@ -90,14 +90,6 @@
#include <machine/pic.h>
#include <machine/i8259.h>
-
-#ifndef __x86_64__
-#include "mca.h"
-#if NMCA > 0
-#include <machine/mca_machdep.h> /* for MCA_system */
-#endif
-#endif
-
static void i8259_hwmask(struct pic *, int);
static void i8259_hwunmask(struct pic *, int);
static void i8259_setup(struct pic *, struct cpu_info *, int, int, int);
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c
index 43a7849f9a2..c0cff0aa0bb 100644
--- a/sys/arch/amd64/isa/clock.c
+++ b/sys/arch/amd64/isa/clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clock.c,v 1.6 2005/09/27 21:10:47 deraadt Exp $ */
+/* $OpenBSD: clock.c,v 1.7 2005/12/10 02:08:04 krw Exp $ */
/* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */
/*-
@@ -113,13 +113,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dev/clock_subr.h>
#include <machine/specialreg.h>
-#ifndef __x86_64__
-#include "mca.h"
-#endif
-#if NMCA > 0
-#include <machine/mca_machdep.h> /* for MCA_system */
-#endif
-
#include "pcppi.h"
#if (NPCPPI > 0)
#include <dev/isa/pcppivar.h>