diff options
| author | imp <imp@FreeBSD.org> | 2005-11-14 00:43:44 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2005-11-14 00:43:44 +0000 |
| commit | a37dc6aa6e9a1728be954bd13f53a99911b5d664 (patch) | |
| tree | e112da86724fb8fbf23319d5de3b22ad05026293 | |
| parent | 893249d3c303736c5ed9da6e2914799ca56bbd42 (diff) | |
| download | FreeBSD-src-a37dc6aa6e9a1728be954bd13f53a99911b5d664.zip FreeBSD-src-a37dc6aa6e9a1728be954bd13f53a99911b5d664.tar.gz | |
Provide a dummy NO_XBOX option that lives in opt_xbox.h for pc98.
This allows us to eliminate a three ifdef PC98 instances.
| -rw-r--r-- | sys/conf/options.pc98 | 4 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 2 | ||||
| -rw-r--r-- | sys/i386/i386/vm_machdep.c | 2 | ||||
| -rw-r--r-- | 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 a1f3cc1..4e5d7bb 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 f7e17fa..332a5b5 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 d176b82..217ae8b 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 4ad3f44..869649d 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> |
