From 9ba3a5f6b582f42a05bca49c733a63e6490a3b35 Mon Sep 17 00:00:00 2001
From: gene <gene@cvs.openbsd.org>
Date: Sun, 3 May 1998 07:16:54 +0000
Subject: Fallout from recent merge of macinfo.h to cpu.h. Also, fallout from
 interrupt glue structure becoming mroe dynamic using locore-changeable
 variables to store ipl levels.

---
 sys/arch/mac68k/mac68k/macrom.c         | 3 +--
 sys/arch/mac68k/mac68k/pmap.c           | 3 +--
 sys/arch/mac68k/mac68k/pmap_bootstrap.c | 3 +--
 sys/arch/mac68k/mac68k/via.c            | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys/arch/mac68k/mac68k/macrom.c b/sys/arch/mac68k/mac68k/macrom.c
index c53bc5e2f4a..d4b34d527b8 100644
--- a/sys/arch/mac68k/mac68k/macrom.c
+++ b/sys/arch/mac68k/mac68k/macrom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macrom.c,v 1.18 1997/11/30 18:25:38 gene Exp $	*/
+/*	$OpenBSD: macrom.c,v 1.19 1998/05/03 07:16:50 gene Exp $	*/
 /*	$NetBSD: macrom.c,v 1.31 1997/03/01 17:20:34 scottr Exp $	*/
 
 /*-
@@ -60,7 +60,6 @@
 #include "macrom.h"
 #include <sys/malloc.h>
 #include <machine/cpu.h>
-#include <machine/macinfo.h>
 
 #include <machine/frame.h>
 
diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c
index 0cb11039397..127cc5ab752 100644
--- a/sys/arch/mac68k/mac68k/pmap.c
+++ b/sys/arch/mac68k/mac68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.9 1997/02/10 12:16:56 downsj Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.10 1998/05/03 07:16:51 gene Exp $	*/
 /*	$NetBSD: pmap.c,v 1.28 1996/10/21 05:42:27 scottr Exp $	*/
 
 /* 
@@ -107,7 +107,6 @@
 #include <vm/vm_page.h>
 
 #include <machine/cpu.h>
-#include <machine/macinfo.h>
 
 #ifdef PMAPSTATS
 struct {
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index aa245d51770..21060af0854 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap_bootstrap.c,v 1.8 1997/01/27 13:27:17 briggs Exp $	*/
+/*	$OpenBSD: pmap_bootstrap.c,v 1.9 1998/05/03 07:16:52 gene Exp $	*/
 /*	$NetBSD: pmap_bootstrap.c,v 1.30 1997/01/07 07:44:01 scottr Exp $	*/
 
 /* 
@@ -51,7 +51,6 @@
 #include <mac68k/mac68k/clockreg.h>
 #include <machine/vmparam.h>
 #include <machine/cpu.h>
-#include <machine/macinfo.h>
 #include <machine/pmap.h>
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/mac68k/mac68k/via.c b/sys/arch/mac68k/mac68k/via.c
index f839db2aad0..76cd847ca90 100644
--- a/sys/arch/mac68k/mac68k/via.c
+++ b/sys/arch/mac68k/mac68k/via.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via.c,v 1.14 1997/03/27 14:58:53 briggs Exp $	*/
+/*	$OpenBSD: via.c,v 1.15 1998/05/03 07:16:53 gene Exp $	*/
 /*	$NetBSD: via.c,v 1.58 1997/03/04 04:11:52 scottr Exp $	*/
 
 /*-
@@ -44,7 +44,6 @@
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
-#include <machine/macinfo.h>
 #include <machine/frame.h>
 #include <machine/viareg.h>
 
-- 
cgit v1.2.3