summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mac68k')
-rw-r--r--sys/arch/mac68k/dev/adb_direct.c3
-rw-r--r--sys/arch/mac68k/dev/adbsys.c3
-rw-r--r--sys/arch/mac68k/dev/esp.c1
-rw-r--r--sys/arch/mac68k/dev/grf_iv.c3
-rw-r--r--sys/arch/mac68k/dev/if_sn_obio.c2
-rw-r--r--sys/arch/mac68k/dev/ite.c3
-rw-r--r--sys/arch/mac68k/dev/mac68k5380.c3
-rw-r--r--sys/arch/mac68k/dev/pm_direct.c3
-rw-r--r--sys/arch/mac68k/dev/sbc.c3
-rw-r--r--sys/arch/mac68k/dev/sbc_obio.c1
-rw-r--r--sys/arch/mac68k/dev/zs.c3
11 files changed, 9 insertions, 19 deletions
diff --git a/sys/arch/mac68k/dev/adb_direct.c b/sys/arch/mac68k/dev/adb_direct.c
index 51575ec3339..73a368a0cf4 100644
--- a/sys/arch/mac68k/dev/adb_direct.c
+++ b/sys/arch/mac68k/dev/adb_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adb_direct.c,v 1.9 1998/04/22 19:59:49 deraadt Exp $ */
+/* $OpenBSD: adb_direct.c,v 1.10 1998/05/03 07:12:51 gene Exp $ */
/* $NetBSD: adb_direct.c,v 1.5 1997/04/21 18:04:28 scottr Exp $ */
/* From: adb_direct.c 2.02 4/18/97 jpw */
@@ -47,7 +47,6 @@
#include <machine/param.h>
#include <machine/cpu.h>
#include <machine/adbsys.h> /* required for adbvar.h */
-#include <machine/macinfo.h>
#include <arch/mac68k/mac68k/macrom.h>
#include "adbvar.h"
diff --git a/sys/arch/mac68k/dev/adbsys.c b/sys/arch/mac68k/dev/adbsys.c
index 95369269adc..4d83d54b150 100644
--- a/sys/arch/mac68k/dev/adbsys.c
+++ b/sys/arch/mac68k/dev/adbsys.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: adbsys.c,v 1.9 1997/04/14 18:47:55 gene Exp $ */
+/* $OpenBSD: adbsys.c,v 1.10 1998/05/03 07:12:53 gene Exp $ */
/* $NetBSD: adbsys.c,v 1.24 1997/01/13 07:01:23 scottr Exp $ */
/*-
@@ -35,7 +35,6 @@
#include <sys/systm.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/viareg.h>
#include <arch/mac68k/mac68k/macrom.h>
diff --git a/sys/arch/mac68k/dev/esp.c b/sys/arch/mac68k/dev/esp.c
index 35dd3d451fa..3fd740b8a37 100644
--- a/sys/arch/mac68k/dev/esp.c
+++ b/sys/arch/mac68k/dev/esp.c
@@ -99,7 +99,6 @@
#include <dev/ic/ncr53c9xreg.h>
#include <dev/ic/ncr53c9xvar.h>
-#include <machine/macinfo.h>
#include <machine/viareg.h>
#include <mac68k/dev/espvar.h>
diff --git a/sys/arch/mac68k/dev/grf_iv.c b/sys/arch/mac68k/dev/grf_iv.c
index 1ae35952f6b..abb9092698a 100644
--- a/sys/arch/mac68k/dev/grf_iv.c
+++ b/sys/arch/mac68k/dev/grf_iv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_iv.c,v 1.16 1998/04/27 02:04:34 gene Exp $ */
+/* $OpenBSD: grf_iv.c,v 1.17 1998/05/03 07:12:55 gene Exp $ */
/* $NetBSD: grf_iv.c,v 1.17 1997/02/20 00:23:27 scottr Exp $ */
/*
@@ -47,7 +47,6 @@
#include <machine/autoconf.h>
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/grfioctl.h>
#include <machine/viareg.h>
diff --git a/sys/arch/mac68k/dev/if_sn_obio.c b/sys/arch/mac68k/dev/if_sn_obio.c
index 7b012bfa5fa..a97e9b867ee 100644
--- a/sys/arch/mac68k/dev/if_sn_obio.c
+++ b/sys/arch/mac68k/dev/if_sn_obio.c
@@ -43,7 +43,7 @@
#include <netinet/if_ether.h>
#include <machine/bus.h>
-#include <machine/macinfo.h>
+#include <machine/cpu.h>
#include <machine/viareg.h>
#include "obiovar.h"
diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c
index 8cbbfccdf09..1f815f83b3f 100644
--- a/sys/arch/mac68k/dev/ite.c
+++ b/sys/arch/mac68k/dev/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.16 1997/11/14 03:40:58 gene Exp $ */
+/* $OpenBSD: ite.c,v 1.17 1998/05/03 07:12:58 gene Exp $ */
/* $NetBSD: ite.c,v 1.32 1997/02/20 00:23:25 scottr Exp $ */
/*
@@ -67,7 +67,6 @@
#include <machine/bus.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/frame.h>
#include <machine/viareg.h>
diff --git a/sys/arch/mac68k/dev/mac68k5380.c b/sys/arch/mac68k/dev/mac68k5380.c
index f1ae755c4cb..5e7b6ce6927 100644
--- a/sys/arch/mac68k/dev/mac68k5380.c
+++ b/sys/arch/mac68k/dev/mac68k5380.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mac68k5380.c,v 1.11 1997/04/27 19:28:39 briggs Exp $ */
+/* $OpenBSD: mac68k5380.c,v 1.12 1998/05/03 07:12:59 gene Exp $ */
/* $NetBSD: mac68k5380.c,v 1.29 1997/02/28 15:50:50 scottr Exp $ */
/*
@@ -51,7 +51,6 @@
#include "ncr5380reg.h"
#include <machine/stdarg.h>
-#include <machine/macinfo.h>
#include <machine/viareg.h>
#include "ncr5380var.h"
diff --git a/sys/arch/mac68k/dev/pm_direct.c b/sys/arch/mac68k/dev/pm_direct.c
index b026b9e647d..a0423f468b6 100644
--- a/sys/arch/mac68k/dev/pm_direct.c
+++ b/sys/arch/mac68k/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pm_direct.c,v 1.2 1997/04/06 16:35:18 briggs Exp $ */
+/* $OpenBSD: pm_direct.c,v 1.3 1998/05/03 07:13:00 gene Exp $ */
/* pm_direct.c 1.22 01/09/97 Takashi Hamada */
/*
@@ -42,7 +42,6 @@
#include <machine/adbsys.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/param.h>
#include <machine/viareg.h>
diff --git a/sys/arch/mac68k/dev/sbc.c b/sys/arch/mac68k/dev/sbc.c
index a30640d7a62..0ccf2456fca 100644
--- a/sys/arch/mac68k/dev/sbc.c
+++ b/sys/arch/mac68k/dev/sbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbc.c,v 1.10 1997/04/18 21:58:54 gene Exp $ */
+/* $OpenBSD: sbc.c,v 1.11 1998/05/03 07:13:01 gene Exp $ */
/* $NetBSD: sbc.c,v 1.24 1997/04/18 17:38:08 scottr Exp $ */
/*
@@ -67,7 +67,6 @@
#include <dev/ic/ncr5380var.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/viareg.h>
#include "sbcreg.h"
diff --git a/sys/arch/mac68k/dev/sbc_obio.c b/sys/arch/mac68k/dev/sbc_obio.c
index e851eeb8d3b..4d944bd3dc6 100644
--- a/sys/arch/mac68k/dev/sbc_obio.c
+++ b/sys/arch/mac68k/dev/sbc_obio.c
@@ -49,7 +49,6 @@
#include <machine/cpu.h>
#include <machine/viareg.h>
-#include <machine/macinfo.h>
#include "sbcreg.h"
#include "sbcvar.h"
diff --git a/sys/arch/mac68k/dev/zs.c b/sys/arch/mac68k/dev/zs.c
index 3f6d0eb8045..8bb4bce65ad 100644
--- a/sys/arch/mac68k/dev/zs.c
+++ b/sys/arch/mac68k/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.10 1997/06/20 22:32:10 gene Exp $ */
+/* $OpenBSD: zs.c,v 1.11 1998/05/03 07:13:03 gene Exp $ */
/* $NetBSD: zs.c,v 1.12 1996/12/18 05:04:22 scottr Exp $ */
/*
@@ -57,7 +57,6 @@
#include <machine/autoconf.h>
#include <machine/cpu.h>
-#include <machine/macinfo.h>
#include <machine/viareg.h>
/*