summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-09-20 05:28:02 +0000
committerkato <kato@FreeBSD.org>1997-09-20 05:28:02 +0000
commit16203bbd93cef4831f887fffd9076c2eff3ea461 (patch)
treea5164009768eca1d701a2853856fdf340441db75 /sys/conf
parentbbdf620f6f503d91d704c2f3738268a0e6793b65 (diff)
downloadFreeBSD-src-16203bbd93cef4831f887fffd9076c2eff3ea461.zip
FreeBSD-src-16203bbd93cef4831f887fffd9076c2eff3ea461.tar.gz
Synchronize with sys/i386/conf/options.i386 and sys/i386/isa/sio.c
revisions 1.60 and 1.182, respectively.
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/options.pc983
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 3ba2f80..b1ca5d4 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -1,4 +1,4 @@
-# $Id: options.pc98,v 1.38 1997/09/05 10:18:16 kato Exp $
+# $Id: options.pc98,v 1.39 1997/09/17 08:00:56 kato Exp $
BOUNCEPAGES opt_bounce.h
USER_LDT
MATH_EMULATE opt_math_emulate.h
@@ -22,6 +22,7 @@ CONUNIT opt_defunct.h
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_i586_guprof.h
I586_PMC_GUPROF opt_i586_guprof.h
FAT_CURSOR opt_pcvt.h
OpenPOWER on IntegriCloud