From 0c0bda62e2cffb57e61ba0c410acf6b2773c9971 Mon Sep 17 00:00:00 2001
From: kato <kato@FreeBSD.org>
Date: Mon, 23 Jun 1997 09:35:47 +0000
Subject: 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
---
 sys/pc98/conf/options.pc98 | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'sys/pc98/conf')

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
-- 
cgit v1.1