sync

2 files changed, 4 insertions, 11 deletions

diff --git a/sys/arch/i386/conf/SPARE-PARTS b/sys/arch/i386/conf/SPARE-PARTS
index c24cb62d282..06c4e9565c1 100644
--- a/sys/arch/i386/conf/SPARE-PARTS
+++ b/sys/arch/i386/conf/SPARE-PARTS
@@ -1,13 +1,13 @@
 #
 #	SPARE-PARTS: spare-parts.teeny.org, the teeny gateway to the world.
 #
-#	$OpenBSD: SPARE-PARTS,v 1.6 1996/09/20 06:45:09 deraadt Exp $
+#	$OpenBSD: SPARE-PARTS,v 1.7 1996/10/04 07:29:21 downsj Exp $
 #
 
 machine		i386
 option		I386_CPU
 option		I486_CPU
-option		MATH_EMULATE
+option		GPL_MATH_EMULATE
 
 maxusers	8
 option		TIMEZONE=480
@@ -92,6 +92,7 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2
 fd*	at fdc? drive ?
 
 wdc0	at isa? port 0x1f0 irq 14
+option	WDC_ST11
 wdc1	at isa? port 0x170 irq 15
 wd*	at wdc? drive ?
 
diff --git a/sys/arch/i386/conf/THREADWAY b/sys/arch/i386/conf/THREADWAY
index 83083318014..841cbe2d69f 100644
--- a/sys/arch/i386/conf/THREADWAY
+++ b/sys/arch/i386/conf/THREADWAY
@@ -1,7 +1,7 @@
 #
 #	THREADWAY: threadway.teeny.org
 #
-#	$OpenBSD: THREADWAY,v 1.14 1996/09/20 06:45:10 deraadt Exp $
+#	$OpenBSD: THREADWAY,v 1.15 1996/10/04 07:29:20 downsj Exp $
 #
 
 machine		i386
@@ -15,9 +15,6 @@ maxusers	32
 option		TIMEZONE=480
 option		DST=0
 
-option		GPL_MATH_EMULATE
-option		ALWAYS_MATH_EMULATE
-
 option		SWAPPAGER
 option		DEVPAGER
 
@@ -55,9 +52,6 @@ option		MFS
 option		LFS
 option		EXT2FS
 
-option		PPP_BSDCOMP,PPP_DEFLATE
-option		IPFILTER
-
 option		NFSCLIENT
 option		NFSSERVER
 
@@ -71,7 +65,6 @@ option		PROCFS
 option		UMAPFS
 option		UNION
 
-#option		GATEWAY
 option		INET
 
 config		bsd root on wd0 swap on wd0 and wd1 and wd2
@@ -123,7 +116,6 @@ acd*	at atapibus? drive?
 
 pseudo-device	loop	1
 pseudo-device	bpfilter 8
-pseudo-device	ppp	4
 pseudo-device	tun	2
 
 pseudo-device	pty	64