From 890e12c6b0f2fc5580e638fb7a4a27f3908f6139 Mon Sep 17 00:00:00 2001
From: kato <kato@FreeBSD.org>
Date: Tue, 17 Mar 1998 09:11:03 +0000
Subject: Make EPSON_BOUNCEDMA a new-style option.

---
 sys/amd64/amd64/vm_machdep.c | 5 ++++-
 sys/conf/options.pc98        | 3 ++-
 sys/i386/i386/vm_machdep.c   | 5 ++++-
 sys/i386/isa/bs/bshw.c       | 1 +
 sys/i386/isa/bs/bsif.c       | 1 +
 sys/pc98/conf/options.pc98   | 3 ++-
 sys/pc98/pc98/pc98.c         | 5 ++++-
 7 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 56e9d2f..8ac19b1 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -38,13 +38,16 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.102 1998/03/12 09:55:57 bde Exp $
+ *	$Id: vm_machdep.c,v 1.103 1998/03/14 03:02:15 tegge Exp $
  */
 
 #include "npx.h"
 #include "opt_bounce.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
+#ifdef PC98
+#include "opt_pc98.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index b4c78f4f..9af141e 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.56 1998/03/09 10:16:56 kato Exp $
+#	$Id: options.pc98,v 1.57 1998/03/10 12:48:57 kato Exp $
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
 USER_LDT
@@ -128,5 +128,6 @@ FPU_ERROR_BROKEN	opt_npx.h
 
 # PC98 options
 PC98			opt_global.h
+EPSON_BOUNCEDMA		opt_pc98.h
 EPSON_MEMWIN		opt_pc98.h
 COMPAT_ATDISK		opt_pc98.h
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 56e9d2f..8ac19b1 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -38,13 +38,16 @@
  *
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- *	$Id: vm_machdep.c,v 1.102 1998/03/12 09:55:57 bde Exp $
+ *	$Id: vm_machdep.c,v 1.103 1998/03/14 03:02:15 tegge Exp $
  */
 
 #include "npx.h"
 #include "opt_bounce.h"
 #include "opt_user_ldt.h"
 #include "opt_vm86.h"
+#ifdef PC98
+#include "opt_pc98.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/isa/bs/bshw.c b/sys/i386/isa/bs/bshw.c
index 33a848e..9b66569 100644
--- a/sys/i386/isa/bs/bshw.c
+++ b/sys/i386/isa/bs/bshw.c
@@ -38,6 +38,7 @@
 #include <i386/Cbus/dev/bs/bshw.lst>
 #endif
 #ifdef	__FreeBSD__
+#include "opt_pc98.h"
 #include <i386/isa/ic/i8237.h>
 #include <i386/isa/bs/bsif.h>
 #include <i386/isa/bs/bshw.lst>
diff --git a/sys/i386/isa/bs/bsif.c b/sys/i386/isa/bs/bsif.c
index e6579ae..d9a8210 100644
--- a/sys/i386/isa/bs/bsif.c
+++ b/sys/i386/isa/bs/bsif.c
@@ -37,6 +37,7 @@
 #endif	/* __NetBSD__ */
 #ifdef __FreeBSD__
 #include "opt_bs.h"
+#include "opt_pc98.h"
 #include "bs.h"
 #include <i386/isa/bs/bsif.h>
 #endif	/* __FreeBSD__ */
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index b4c78f4f..9af141e 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -1,4 +1,4 @@
-#	$Id: options.pc98,v 1.56 1998/03/09 10:16:56 kato Exp $
+#	$Id: options.pc98,v 1.57 1998/03/10 12:48:57 kato Exp $
 BOUNCEPAGES		opt_bounce.h
 DISABLE_PSE
 USER_LDT
@@ -128,5 +128,6 @@ FPU_ERROR_BROKEN	opt_npx.h
 
 # PC98 options
 PC98			opt_global.h
+EPSON_BOUNCEDMA		opt_pc98.h
 EPSON_MEMWIN		opt_pc98.h
 COMPAT_ATDISK		opt_pc98.h
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index 811ea37..c720039 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: pc98.c,v 1.47 1998/02/05 10:06:42 kato Exp $
+ *	$Id: pc98.c,v 1.48 1998/02/06 12:14:03 eivind Exp $
  */
 
 /*
@@ -51,6 +51,9 @@
  * modified for PC9801 by A.Kojima F.Ukai M.Ishii 
  *			Kyoto University Microcomputer Club (KMC)
  */
+#ifdef PC98
+#include "opt_pc98.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
-- 
cgit v1.1