diff options
author | kato <kato@FreeBSD.org> | 1997-06-23 09:35:47 +0000 |
---|---|---|
committer | kato <kato@FreeBSD.org> | 1997-06-23 09:35:47 +0000 |
commit | 0c0bda62e2cffb57e61ba0c410acf6b2773c9971 (patch) | |
tree | 0937d9d498cd4fc33d8825fb154045e54291976b /sys/pc98/conf | |
parent | 635eadcfef90d1812d9784d63bbd28239769e24c (diff) | |
download | FreeBSD-src-0c0bda62e2cffb57e61ba0c410acf6b2773c9971.zip FreeBSD-src-0c0bda62e2cffb57e61ba0c410acf6b2773c9971.tar.gz |
Synchronize with following changes:
> Revision Changes Path
> 1.250 +1 -18 src/sys/i386/i386/machdep.c
> 1.48 +1 -7 src/sys/i386/conf/options.i386
> 1.251 +19 -46 src/sys/i386/i386/machdep.c
> 1.24 +2 -6 src/sys/i386/i386/microtime.s
> 1.100 +4 -15 src/sys/i386/i386/trap.c
> 1.46 +6 -7 src/sys/i386/isa/npx.c
Diffstat (limited to 'sys/pc98/conf')
-rw-r--r-- | sys/pc98/conf/options.pc98 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98 index 620d05b..9a19da0 100644 --- a/sys/pc98/conf/options.pc98 +++ b/sys/pc98/conf/options.pc98 @@ -1,4 +1,4 @@ -# $Id: options.pc98,v 1.26 1997/06/04 10:29:17 kato Exp $ +# $Id: options.pc98,v 1.27 1997/06/06 13:07:18 kato Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -40,12 +40,6 @@ NAPIC opt_smp.h NINTR opt_smp.h SMP_TIMER_NC opt_smp.h -# These three are known to be broken, don't enable them. -SMP_PRIVPAGES opt_smp_privpages.h -SMP_AUTOSTART opt_smp_autostart.h - -SERIAL_DEBUG opt_serial.h - AHC_TAGENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h AHC_ALLOW_MEMIO opt_aic7xxx.h |