From a37dc6aa6e9a1728be954bd13f53a99911b5d664 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Mon, 14 Nov 2005 00:43:44 +0000
Subject: [PATCH] Provide a dummy NO_XBOX option that lives in opt_xbox.h for
 pc98. This allows us to eliminate a three ifdef PC98 instances.

---
 sys/conf/options.pc98      | 4 ++++
 sys/i386/i386/pmap.c       | 2 --
 sys/i386/i386/vm_machdep.c | 2 --
 sys/i386/pci/pci_cfgreg.c  | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index a1f3cc196f37..4e5d7bb239de 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -105,3 +105,7 @@ DEV_NPX			opt_npx.h
 # Debugging
 STOP_NMI		opt_cpu.h
 NPX_DEBUG		opt_npx.h
+
+# FreeBSD/i386 supports xbox and is shred with pc98 so we need to define dummy
+# opt_xbox.h
+NO_XBOX			opt_xbox.h
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index f7e17fa566d7..332a5b590bba 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -106,9 +106,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_cpu.h"
 #include "opt_pmap.h"
 #include "opt_msgbuf.h"
-#ifndef PC98 
 #include "opt_xbox.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index d176b82d08bf..217ae8b85b75 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -47,9 +47,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_npx.h"
 #include "opt_reset.h"
 #include "opt_cpu.h"
-#ifndef PC98 
 #include "opt_xbox.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 4ad3f44f67c0..869649de34a9 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -30,9 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#ifndef PC98
 #include "opt_xbox.h"
-#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>