diff options
| author | kato <kato@FreeBSD.org> | 1998-01-31 14:10:14 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1998-01-31 14:10:14 +0000 |
| commit | 4a7bba04425a666433ce9e6804c9cd2824a78bef (patch) | |
| tree | b38a2ce39b4cb62db9109ee108c619a8030ff580 /sys | |
| parent | 8d888fd611a35b574ab454c4416415f7737fce54 (diff) | |
| download | FreeBSD-src-4a7bba04425a666433ce9e6804c9cd2824a78bef.zip FreeBSD-src-4a7bba04425a666433ce9e6804c9cd2824a78bef.tar.gz | |
Sync with sys/i386/conf/options.i386 revision 1.70.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/conf/options.pc98 | 7 | ||||
| -rw-r--r-- | sys/pc98/conf/options.pc98 | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 0fdceb9..3a5d919 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -1,4 +1,4 @@ -# $Id: options.pc98,v 1.47 1998/01/25 09:45:38 kato Exp $ +# $Id: options.pc98,v 1.48 1998/01/26 09:17:43 kato Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -12,6 +12,7 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h +POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h @@ -23,8 +24,9 @@ COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h +I586_CTR_GUPROF opt_defunct.h I586_PMC_GUPROF opt_i586_guprof.h -TSC_GUPROF opt_i586_guprof.h +TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h @@ -45,7 +47,6 @@ AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_I586_CALIBRATION opt_clock.h CLK_USE_TSC_CALIBRATION opt_clock.h NO_F00F_HACK opt_cpu.h diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98 index 0fdceb9..3a5d919 100644 --- a/sys/pc98/conf/options.pc98 +++ b/sys/pc98/conf/options.pc98 @@ -1,4 +1,4 @@ -# $Id: options.pc98,v 1.47 1998/01/25 09:45:38 kato Exp $ +# $Id: options.pc98,v 1.48 1998/01/26 09:17:43 kato Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -12,6 +12,7 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h MAXMEM PERFMON opt_perfmon.h +POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h BREAK_TO_DEBUGGER opt_comconsole.h @@ -23,8 +24,9 @@ COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h DSI_SOFT_MODEM opt_sio.h EXTRA_SIO opt_sio.h +I586_CTR_GUPROF opt_defunct.h I586_PMC_GUPROF opt_i586_guprof.h -TSC_GUPROF opt_i586_guprof.h +TSC_GUPROF opt_defunct.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h @@ -45,7 +47,6 @@ AHC_SHARE_SCBS opt_aic7xxx.h CLK_CALIBRATION_LOOP opt_clock.h CLK_USE_I8254_CALIBRATION opt_clock.h -CLK_USE_I586_CALIBRATION opt_clock.h CLK_USE_TSC_CALIBRATION opt_clock.h NO_F00F_HACK opt_cpu.h |
