summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-06-11 03:25:47 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-06-11 03:25:47 +0000
commita239058e10004764d122b99baff597381704f4ae (patch)
tree3cdce4085b20454523cc56dd380cede21ada1ad4
parent591f56220b3742b57ef11a6c0e0892878cd36897 (diff)
Include <sys/conf.h> from <machine/conf.h> like in other arches. Changes
to come soon depend on this.
Diffstat
-rw-r--r--sys/arch/amiga/amiga/autoconf.c4
-rw-r--r--sys/arch/amiga/amiga/conf.c3
-rw-r--r--sys/arch/amiga/amiga/machdep.c4
-rw-r--r--sys/arch/amiga/amiga/mem.c4
-rw-r--r--sys/arch/amiga/amiga/swapgeneric.c4
-rw-r--r--sys/arch/amiga/dev/com_supio.c4
-rw-r--r--sys/arch/amiga/dev/drsupio.c3
-rw-r--r--sys/arch/amiga/dev/fd.c3
-rw-r--r--sys/arch/amiga/dev/grf.c3
-rw-r--r--sys/arch/amiga/dev/grf_cc.c3
-rw-r--r--sys/arch/amiga/dev/ite.c7
-rw-r--r--sys/arch/amiga/dev/ite_cc.c4
-rw-r--r--sys/arch/amiga/dev/ite_cl.c4
-rw-r--r--sys/arch/amiga/dev/ite_cv.c4
-rw-r--r--sys/arch/amiga/dev/ite_et.c4
-rw-r--r--sys/arch/amiga/dev/ite_rh.c4
-rw-r--r--sys/arch/amiga/dev/ite_rt.c4
-rw-r--r--sys/arch/amiga/dev/ite_ul.c4
-rw-r--r--sys/arch/amiga/dev/joy.c3
-rw-r--r--sys/arch/amiga/dev/kbd.c3
-rw-r--r--sys/arch/amiga/dev/mfc.c3
-rw-r--r--sys/arch/amiga/dev/ms.c3
-rw-r--r--sys/arch/amiga/dev/msc.c3
-rw-r--r--sys/arch/amiga/dev/par.c3
-rw-r--r--sys/arch/amiga/dev/ser.c3
-rw-r--r--sys/arch/amiga/dev/view.c3
-rw-r--r--sys/arch/amiga/include/conf.h4
27 files changed, 43 insertions, 55 deletions
diff --git a/sys/arch/amiga/amiga/autoconf.c b/sys/arch/amiga/amiga/autoconf.c
index b578b61c1f6..c1b54fc6294 100644
--- a/sys/arch/amiga/amiga/autoconf.c
+++ b/sys/arch/amiga/amiga/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: autoconf.c,v 1.16 2002/06/11 03:25:30 miod Exp $ */
/* $NetBSD: autoconf.c,v 1.59 1998/01/15 21:55:51 is Exp $ */
/*
@@ -33,9 +33,9 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/reboot.h>
-#include <sys/conf.h>
#include <sys/device.h>
#include <sys/disklabel.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/cfdev.h>
#include <amiga/amiga/device.h>
diff --git a/sys/arch/amiga/amiga/conf.c b/sys/arch/amiga/amiga/conf.c
index a073235db15..364ca687b5d 100644
--- a/sys/arch/amiga/amiga/conf.c
+++ b/sys/arch/amiga/amiga/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.35 2002/05/16 21:11:13 miod Exp $ */
+/* $OpenBSD: conf.c,v 1.36 2002/06/11 03:25:30 miod Exp $ */
/* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */
/*-
@@ -41,7 +41,6 @@
#include <sys/buf.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
-#include <sys/conf.h>
#include <sys/vnode.h>
#include <dev/cons.h>
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index 9a9aeb236d2..2e23c438755 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.69 2002/03/23 13:28:33 espie Exp $ */
+/* $OpenBSD: machdep.c,v 1.70 2002/06/11 03:25:31 miod Exp $ */
/* $NetBSD: machdep.c,v 1.95 1997/08/27 18:31:17 is Exp $ */
/*
@@ -50,7 +50,6 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/reboot.h>
-#include <sys/conf.h>
#include <sys/file.h>
#include <sys/clist.h>
#include <sys/timeout.h>
@@ -84,6 +83,7 @@
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/psl.h>
diff --git a/sys/arch/amiga/amiga/mem.c b/sys/arch/amiga/amiga/mem.c
index 152d6ce4452..a297a78aef9 100644
--- a/sys/arch/amiga/amiga/mem.c
+++ b/sys/arch/amiga/amiga/mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mem.c,v 1.18 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: mem.c,v 1.19 2002/06/11 03:25:31 miod Exp $ */
/* $NetBSD: mem.c,v 1.18 1997/02/02 07:17:14 thorpej Exp $ */
/*
@@ -46,13 +46,13 @@
*/
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/systm.h>
#include <sys/uio.h>
#include <sys/malloc.h>
#include <sys/proc.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c
index d12e5dc52c0..685398c47b5 100644
--- a/sys/arch/amiga/amiga/swapgeneric.c
+++ b/sys/arch/amiga/amiga/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.15 2002/03/15 01:20:04 millert Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.16 2002/06/11 03:25:31 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $ */
/*
@@ -38,7 +38,6 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/conf.h>
#include <sys/buf.h>
#include <sys/reboot.h>
#include <sys/device.h>
@@ -47,6 +46,7 @@
#include <sys/proc.h> /* XXXX and all that uses it */
#include <sys/disk.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include "fd.h"
diff --git a/sys/arch/amiga/dev/com_supio.c b/sys/arch/amiga/dev/com_supio.c
index f2a75dd7a03..acae5c80661 100644
--- a/sys/arch/amiga/dev/com_supio.c
+++ b/sys/arch/amiga/dev/com_supio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: com_supio.c,v 1.4 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: com_supio.c,v 1.5 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: com_supio.c,v 1.3 1997/08/27 20:41:30 is Exp $ */
/*-
@@ -45,7 +45,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/user.h>
-#include <sys/conf.h>
#include <sys/file.h>
#include <sys/uio.h>
#include <sys/kernel.h>
@@ -53,6 +52,7 @@
#include <sys/types.h>
#include <sys/device.h>
+#include <machine/conf.h>
#include <machine/intr.h>
#include <machine/bus.h>
diff --git a/sys/arch/amiga/dev/drsupio.c b/sys/arch/amiga/dev/drsupio.c
index 27e332f1ed1..619a09a5081 100644
--- a/sys/arch/amiga/dev/drsupio.c
+++ b/sys/arch/amiga/dev/drsupio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drsupio.c,v 1.2 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: drsupio.c,v 1.3 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: drsupio.c,v 1.1 1997/08/27 19:32:53 is Exp $ */
/*
@@ -38,7 +38,6 @@
#include <sys/types.h>
-#include <sys/conf.h>
#include <sys/device.h>
#include <sys/systm.h>
#include <sys/param.h>
diff --git a/sys/arch/amiga/dev/fd.c b/sys/arch/amiga/dev/fd.c
index d37d49f46f7..5631425efde 100644
--- a/sys/arch/amiga/dev/fd.c
+++ b/sys/arch/amiga/dev/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.16 2002/06/05 16:55:41 art Exp $ */
+/* $OpenBSD: fd.c,v 1.17 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: fd.c,v 1.36 1996/12/23 09:09:59 veego Exp $ */
/*
@@ -52,7 +52,6 @@
#include <amiga/amiga/cc.h>
#include <amiga/amiga/isr.h>
-#include <sys/conf.h>
#include <machine/conf.h>
enum fdc_bits { FDB_CHANGED = 2, FDB_PROTECT, FDB_CYLZERO, FDB_READY };
diff --git a/sys/arch/amiga/dev/grf.c b/sys/arch/amiga/dev/grf.c
index a8bb25089ca..0c6700d32e1 100644
--- a/sys/arch/amiga/dev/grf.c
+++ b/sys/arch/amiga/dev/grf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf.c,v 1.15 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: grf.c,v 1.16 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: grf.c,v 1.32 1996/12/23 09:10:01 veego Exp $ */
/*
@@ -68,7 +68,6 @@
#include <amiga/dev/itevar.h>
#include <amiga/dev/viewioctl.h>
-#include <sys/conf.h>
#include <machine/conf.h>
#include "view.h"
diff --git a/sys/arch/amiga/dev/grf_cc.c b/sys/arch/amiga/dev/grf_cc.c
index 56531904c0f..ffa10cb3332 100644
--- a/sys/arch/amiga/dev/grf_cc.c
+++ b/sys/arch/amiga/dev/grf_cc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grf_cc.c,v 1.10 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: grf_cc.c,v 1.11 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: grf_cc.c,v 1.23 1996/12/23 09:10:02 veego Exp $ */
/*
@@ -56,7 +56,6 @@
#include <amiga/dev/grfabs_reg.h>
#include <amiga/dev/viewioctl.h>
-#include <sys/conf.h>
#include <machine/conf.h>
#include <uvm/uvm_extern.h>
diff --git a/sys/arch/amiga/dev/ite.c b/sys/arch/amiga/dev/ite.c
index 36182778fc0..3e4ceb711ec 100644
--- a/sys/arch/amiga/dev/ite.c
+++ b/sys/arch/amiga/dev/ite.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite.c,v 1.16 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite.c,v 1.47 1996/12/23 09:10:20 veego Exp $ */
/*
@@ -69,10 +69,9 @@
#include <amiga/dev/grfioctl.h>
#include <amiga/dev/grfvar.h>
-#include <machine/cpu.h> /* for is_draco() */
-
-#include <sys/conf.h>
#include <machine/conf.h>
+#include <machine/cons.h>
+#include <machine/cpu.h> /* for is_draco() */
#include "grfcc.h"
#include "ite.h"
diff --git a/sys/arch/amiga/dev/ite_cc.c b/sys/arch/amiga/dev/ite_cc.c
index 42e3d3fa89b..68f0a69197a 100644
--- a/sys/arch/amiga/dev/ite_cc.c
+++ b/sys/arch/amiga/dev/ite_cc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_cc.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_cc.c,v 1.4 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_cc.c,v 1.25 1996/04/21 21:11:54 veego Exp $ */
/*
@@ -34,7 +34,6 @@
#if NGRFCC > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
@@ -43,6 +42,7 @@
#include <sys/queue.h>
#include <sys/termios.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/dev/itevar.h>
#include <amiga/dev/iteioctl.h>
diff --git a/sys/arch/amiga/dev/ite_cl.c b/sys/arch/amiga/dev/ite_cl.c
index 43ffc670e69..7245ebdb5d6 100644
--- a/sys/arch/amiga/dev/ite_cl.c
+++ b/sys/arch/amiga/dev/ite_cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_cl.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_cl.c,v 1.6 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_cl.c,v 1.3.2.1 1999/06/28 23:22:17 perry Exp $ */
/*
@@ -38,13 +38,13 @@
#if NGRFCL > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/dev/grfioctl.h>
diff --git a/sys/arch/amiga/dev/ite_cv.c b/sys/arch/amiga/dev/ite_cv.c
index e2757252906..fd5776ae0bf 100644
--- a/sys/arch/amiga/dev/ite_cv.c
+++ b/sys/arch/amiga/dev/ite_cv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_cv.c,v 1.4 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_cv.c,v 1.5 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_cv.c,v 1.3 1996/05/19 21:05:58 veego Exp $ */
/*
@@ -42,7 +42,6 @@
#if NGRFCV > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
@@ -52,6 +51,7 @@
#include <sys/termios.h>
#include <sys/malloc.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/dev/itevar.h>
#include <amiga/dev/iteioctl.h>
diff --git a/sys/arch/amiga/dev/ite_et.c b/sys/arch/amiga/dev/ite_et.c
index fee6799f731..2fcb05ba86e 100644
--- a/sys/arch/amiga/dev/ite_et.c
+++ b/sys/arch/amiga/dev/ite_et.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_et.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_et.c,v 1.6 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_et.c,v 1.3 1997/03/05 22:50:41 veego Exp $ */
/*
@@ -38,13 +38,13 @@
#if NGRFET > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/dev/grfioctl.h>
diff --git a/sys/arch/amiga/dev/ite_rh.c b/sys/arch/amiga/dev/ite_rh.c
index 978d586e9a3..5492524ec83 100644
--- a/sys/arch/amiga/dev/ite_rh.c
+++ b/sys/arch/amiga/dev/ite_rh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_rh.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_rh.c,v 1.4 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_rh.c,v 1.7 1996/04/23 22:53:05 veego Exp $ */
/*
@@ -35,13 +35,13 @@
#if NGRFRH > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/dev/grfioctl.h>
diff --git a/sys/arch/amiga/dev/ite_rt.c b/sys/arch/amiga/dev/ite_rt.c
index a669b9a4f67..5faf23c91c5 100644
--- a/sys/arch/amiga/dev/ite_rt.c
+++ b/sys/arch/amiga/dev/ite_rt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_rt.c,v 1.3 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_rt.c,v 1.4 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_rt.c,v 1.16 1996/04/23 22:53:12 veego Exp $ */
/*
@@ -35,13 +35,13 @@
#if NGRFRT > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/dev/itevar.h>
diff --git a/sys/arch/amiga/dev/ite_ul.c b/sys/arch/amiga/dev/ite_ul.c
index 5a7b4ad61f8..985e1dba3e7 100644
--- a/sys/arch/amiga/dev/ite_ul.c
+++ b/sys/arch/amiga/dev/ite_ul.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ite_ul.c,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ite_ul.c,v 1.6 2002/06/11 03:25:42 miod Exp $ */
/* $NetBSD: ite_ul.c,v 1.7 1996/10/13 03:07:20 christos Exp $ */
/*
@@ -35,13 +35,13 @@
#if NGRFUL > 0
#include <sys/param.h>
-#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/device.h>
#include <sys/ioctl.h>
#include <sys/tty.h>
#include <sys/systm.h>
#include <dev/cons.h>
+#include <machine/conf.h>
#include <machine/cpu.h>
#include <amiga/amiga/device.h>
#include <amiga/amiga/isr.h>
diff --git a/sys/arch/amiga/dev/joy.c b/sys/arch/amiga/dev/joy.c
index 060b6a68605..1763d0b5f56 100644
--- a/sys/arch/amiga/dev/joy.c
+++ b/sys/arch/amiga/dev/joy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: joy.c,v 1.2 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: joy.c,v 1.3 2002/06/11 03:25:42 miod Exp $ */
/*
* Copyright (c) 2000 Marc Espie.
@@ -30,7 +30,6 @@
#include <sys/device.h>
#include <sys/systm.h>
#include <machine/joystick.h>
-#include <sys/conf.h>
#include <machine/conf.h>
#include <amiga/amiga/device.h>
#include <amiga/amiga/custom.h>
diff --git a/sys/arch/amiga/dev/kbd.c b/sys/arch/amiga/dev/kbd.c
index 7cdebc41727..f34f90ba2c0 100644
--- a/sys/arch/amiga/dev/kbd.c
+++ b/sys/arch/amiga/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kbd.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: kbd.c,v 1.7 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: kbd.c,v 1.28 1996/12/23 09:10:22 veego Exp $ */
/*
@@ -60,7 +60,6 @@
#include <amiga/dev/vuid_event.h>
#include "kbd.h"
-#include <sys/conf.h>
#include <machine/conf.h>
struct kbd_softc {
diff --git a/sys/arch/amiga/dev/mfc.c b/sys/arch/amiga/dev/mfc.c
index 1a2ec705621..91768b60f34 100644
--- a/sys/arch/amiga/dev/mfc.c
+++ b/sys/arch/amiga/dev/mfc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfc.c,v 1.12 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: mfc.c,v 1.13 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: mfc.c,v 1.18 1996/12/23 09:10:23 veego Exp $ */
/*
@@ -59,7 +59,6 @@
#include <dev/cons.h>
-#include <sys/conf.h>
#include <machine/conf.h>
#include "mfcs.h"
diff --git a/sys/arch/amiga/dev/ms.c b/sys/arch/amiga/dev/ms.c
index 6824286acce..41c53e132cc 100644
--- a/sys/arch/amiga/dev/ms.c
+++ b/sys/arch/amiga/dev/ms.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ms.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ms.c,v 1.7 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: ms.c,v 1.14 1996/12/23 09:10:25 veego Exp $ */
/*
@@ -70,7 +70,6 @@
#include <amiga/amiga/cia.h>
#include <amiga/amiga/device.h>
-#include <sys/conf.h>
#include <machine/conf.h>
void msattach(struct device *, struct device *, void *);
diff --git a/sys/arch/amiga/dev/msc.c b/sys/arch/amiga/dev/msc.c
index d3630258370..14e4911655e 100644
--- a/sys/arch/amiga/dev/msc.c
+++ b/sys/arch/amiga/dev/msc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: msc.c,v 1.8 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: msc.c,v 1.9 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: msc.c,v 1.13 1996/12/23 09:10:26 veego Exp $ */
/*
@@ -76,7 +76,6 @@
#include <amiga/amiga/cia.h>
#include <amiga/amiga/cc.h>
-#include <sys/conf.h>
#include <machine/conf.h>
/* 6502 code for A2232 card */
diff --git a/sys/arch/amiga/dev/par.c b/sys/arch/amiga/dev/par.c
index 76202a16fe1..b0a6892da64 100644
--- a/sys/arch/amiga/dev/par.c
+++ b/sys/arch/amiga/dev/par.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: par.c,v 1.9 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: par.c,v 1.10 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: par.c,v 1.16 1996/12/23 09:10:28 veego Exp $ */
/*
@@ -57,7 +57,6 @@
#include <amiga/amiga/cia.h>
#include <amiga/dev/parioctl.h>
-#include <sys/conf.h>
#include <machine/conf.h>
struct par_softc {
diff --git a/sys/arch/amiga/dev/ser.c b/sys/arch/amiga/dev/ser.c
index d4419569758..2d03e60def5 100644
--- a/sys/arch/amiga/dev/ser.c
+++ b/sys/arch/amiga/dev/ser.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ser.c,v 1.12 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ser.c,v 1.13 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: ser.c,v 1.43 1998/01/12 10:40:11 thorpej Exp $ */
/*
@@ -52,7 +52,6 @@
#include <sys/kernel.h>
#include <sys/syslog.h>
#include <sys/queue.h>
-#include <sys/conf.h>
#include <machine/cpu.h>
diff --git a/sys/arch/amiga/dev/view.c b/sys/arch/amiga/dev/view.c
index 025b3ad9335..c5d2e21c40d 100644
--- a/sys/arch/amiga/dev/view.c
+++ b/sys/arch/amiga/dev/view.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: view.c,v 1.6 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: view.c,v 1.7 2002/06/11 03:25:43 miod Exp $ */
/* $NetBSD: view.c,v 1.16 1996/10/13 03:07:35 christos Exp $ */
/*
@@ -51,7 +51,6 @@
#include <amiga/dev/viewioctl.h>
#include <amiga/dev/viewvar.h>
-#include <sys/conf.h>
#include <machine/conf.h>
#include "view.h"
diff --git a/sys/arch/amiga/include/conf.h b/sys/arch/amiga/include/conf.h
index d19241ebd18..52bc06776cd 100644
--- a/sys/arch/amiga/include/conf.h
+++ b/sys/arch/amiga/include/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.14 2001/12/11 23:19:02 miod Exp $ */
+/* $OpenBSD: conf.h,v 1.15 2002/06/11 03:25:46 miod Exp $ */
/* $NetBSD: conf.h,v 1.4 1996/11/30 01:13:07 is Exp $ */
/*
@@ -30,6 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <sys/conf.h>
+
cdev_decl(com);
bdev_decl(fd);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 03:45:41 +0000