From dd8c46b8bebb4e4d42f3153947934acd6e5aa5ef Mon Sep 17 00:00:00 2001
From: minoura <minoura@NetBSD.org>
Date: Tue, 18 Apr 2000 21:06:06 +0000
Subject: [PATCH] Explicitly include opt_m680x0.h.

---
 sys/arch/x68k/dev/fd.c              | 3 ++-
 sys/arch/x68k/dev/intio_dmac.c      | 4 +++-
 sys/arch/x68k/x68k/machdep.c        | 3 ++-
 sys/arch/x68k/x68k/pmap.c           | 3 ++-
 sys/arch/x68k/x68k/pmap_bootstrap.c | 8 +++++---
 sys/arch/x68k/x68k/sys_machdep.c    | 3 ++-
 sys/arch/x68k/x68k/trap.c           | 3 ++-
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/sys/arch/x68k/dev/fd.c b/sys/arch/x68k/dev/fd.c
index a17979f83c0a..7cdcd9a64180 100644
--- a/sys/arch/x68k/dev/fd.c
+++ b/sys/arch/x68k/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fd.c,v 1.33 2000/04/07 16:58:56 thorpej Exp $	*/
+/*	$NetBSD: fd.c,v 1.34 2000/04/18 21:06:06 minoura Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,6 +76,7 @@
 
 #include "rnd.h"
 #include "opt_ddb.h"
+#include "opt_m680x0.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/arch/x68k/dev/intio_dmac.c b/sys/arch/x68k/dev/intio_dmac.c
index 83100d2d6854..690dd3d95f14 100644
--- a/sys/arch/x68k/dev/intio_dmac.c
+++ b/sys/arch/x68k/dev/intio_dmac.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: intio_dmac.c,v 1.5 1999/07/08 18:11:02 thorpej Exp $	*/
+/*	$NetBSD: intio_dmac.c,v 1.6 2000/04/18 21:06:06 minoura Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -40,6 +40,8 @@
  * Hitachi HD63450 (= Motorola MC68450) DMAC driver for x68k.
  */
 
+#include "opt_m680x0.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
diff --git a/sys/arch/x68k/x68k/machdep.c b/sys/arch/x68k/x68k/machdep.c
index 36ae56cca4ea..c4a59d79023a 100644
--- a/sys/arch/x68k/x68k/machdep.c
+++ b/sys/arch/x68k/x68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.79 2000/03/28 23:57:31 simonb Exp $	*/
+/*	$NetBSD: machdep.c,v 1.80 2000/04/18 21:06:08 minoura Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,6 +50,7 @@
 #include "opt_ns.h"
 #include "opt_compat_hpux.h"
 #include "opt_compat_netbsd.h"
+#include "opt_m680x0.h"
 #include "opt_fpuemulate.h"
 #include "opt_m060sp.h"
 #include "opt_panicbutton.h"
diff --git a/sys/arch/x68k/x68k/pmap.c b/sys/arch/x68k/x68k/pmap.c
index eece36aa9280..7b24fcc974b3 100644
--- a/sys/arch/x68k/x68k/pmap.c
+++ b/sys/arch/x68k/x68k/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.48 2000/03/26 20:42:41 kleink Exp $	*/
+/*	$NetBSD: pmap.c,v 1.49 2000/04/18 21:06:12 minoura Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -129,6 +129,7 @@
  *	and to when physical maps must be made correct.
  */
 
+#include "opt_m680x0.h"
 #include "opt_compat_hpux.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/x68k/x68k/pmap_bootstrap.c b/sys/arch/x68k/x68k/pmap_bootstrap.c
index ceaa4b9da99d..d8b6fcbf391d 100644
--- a/sys/arch/x68k/x68k/pmap_bootstrap.c
+++ b/sys/arch/x68k/x68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap_bootstrap.c,v 1.17 1999/03/23 04:18:50 minoura Exp $	*/
+/*	$NetBSD: pmap_bootstrap.c,v 1.18 2000/04/18 21:06:12 minoura Exp $	*/
 
 /* 
  * Copyright (c) 1991, 1993
@@ -39,13 +39,15 @@
  *	@(#)pmap_bootstrap.c	8.1 (Berkeley) 6/10/93
  */
 
+#include "opt_m680x0.h"
+
 #include <sys/param.h>
+#include <vm/vm.h>
 #include <machine/pte.h>
-#include <x68k/x68k/iodevice.h>
 #include <machine/vmparam.h>
 #include <machine/cpu.h>
+#include <arch/x68k/x68k/iodevice.h>
 
-#include <vm/vm.h>
 
 #define RELOC(v, t)	*((t*)((caddr_t)&(v) + firstpa))
 #define RELOCA(a, t)	((t)((caddr_t)(a) + firstpa))
diff --git a/sys/arch/x68k/x68k/sys_machdep.c b/sys/arch/x68k/x68k/sys_machdep.c
index 6a6e79f6a950..edc7c29f3dea 100644
--- a/sys/arch/x68k/x68k/sys_machdep.c
+++ b/sys/arch/x68k/x68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.19 1999/11/28 20:31:00 is Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.20 2000/04/18 21:06:12 minoura Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -35,6 +35,7 @@
  *	@(#)sys_machdep.c	8.2 (Berkeley) 1/13/94
  */
 
+#include "opt_m680x0.h"
 #include "opt_compat_hpux.h"
 
 #include <sys/param.h>
diff --git a/sys/arch/x68k/x68k/trap.c b/sys/arch/x68k/x68k/trap.c
index 19881e66b237..2f31f9d260b8 100644
--- a/sys/arch/x68k/x68k/trap.c
+++ b/sys/arch/x68k/x68k/trap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.36 1999/12/05 11:56:37 ragge Exp $	*/
+/*	$NetBSD: trap.c,v 1.37 2000/04/18 21:06:12 minoura Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -49,6 +49,7 @@
 #include "opt_compat_sunos.h"
 #include "opt_compat_hpux.h"
 #include "opt_compat_linux.h"
+#include "opt_m680x0.h"
 #include "opt_fpuemulate.h"
 
 #include <sys/param.h>