diff --git a/sys/i386/conf/SMP-GENERIC b/sys/i386/conf/SMP-GENERIC
index f39affc3f33e..c31ed1cccb39 100644
--- a/sys/i386/conf/SMP-GENERIC
+++ b/sys/i386/conf/SMP-GENERIC
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: SMP-GENERIC,v 1.15 1998/09/18 00:46:41 mjacob Exp $
+#	$Id: SMP-GENERIC,v 1.16 1998/09/25 17:34:48 peter Exp $
 
 machine		"i386"
 # SMP does NOT support 386/486 CPUs.
@@ -41,9 +41,14 @@ options		DDB
 
 options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
+options		FFS_ROOT		#FFS usable as root device [keep this!]
+options		MFS			#Memory Filesystem
+options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
 options		NFS			#Network Filesystem
+options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
 options		MSDOSFS			#MSDOS Filesystem
 options		"CD9660"		#ISO 9660 Filesystem
+options		"CD9660_ROOT"		#CD-ROM usable as root. "CD9660" req'ed
 options		PROCFS			#Process filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
@@ -77,7 +82,8 @@ disk		wd3	at wdc1 drive 1
 
 options		ATAPI		#Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd0	#IDE CD-ROM
+device		wcd0		#IDE CD-ROM
+device		wfd0		#IDE Floppy (e.g. LS-120)
 
 # A single entry for any of these controllers (ncr, ahb, ahc, amd) is
 # sufficient for any number of installed devices.
@@ -89,12 +95,11 @@ controller	isp0
 
 # This controller offers a number of configuration options, too many to
 # document here  - see the LINT file in this directory and look up the
-# dpt0 entry there for much fuller documentation on this.  The options
-# line following dpt0 here is also currently a *required* option for it.
-# controller      dpt0
-# options DPT_MEASURE_PERFORMANCE
+# dpt0 entry there for much fuller documentation on this.
+controller      dpt0
 
 controller	adv0	at isa? port ? cam irq ?
+controller	adw0
 controller	bt0	at isa? port ? cam irq ?
 controller	aha0	at isa? port ? cam irq ?
 #controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
@@ -121,10 +126,10 @@ controller	matcd0	at isa? port 0x230 bio
 device		scd0	at isa? port 0x230 bio
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
+device		sc0	at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
 # Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
-#device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
-#options		XSERVER			# include code for XFree86
+#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
+#options		XSERVER			# support for X server
 #options		FAT_CURSOR		# start with block cursor
 # If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
 #options		PCVT_SCANSET=2		# IBM keyboards are non-std
@@ -147,10 +152,8 @@ device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
 device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
 
 device		lpt0	at isa? port? tty irq 7 vector lptintr
-device		lpt1	at isa? port? tty
-device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
 
-device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
+device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
@@ -163,21 +166,21 @@ device tx0
 device vx0
 device xl0
 
-device ed0 at isa? port 0x280 net irq  5 iomem 0xd8000 vector edintr
+device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
 device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
 device ep0 at isa? port 0x300 net irq 10 vector epintr
 device ex0 at isa? port? net irq? vector exintr
 device fe0 at isa? port 0x300 net irq ? vector feintr
 device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
 device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
-device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
+device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
 device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
 device cs0 at isa? port 0x300 net irq ? vector csintr
 
 pseudo-device	loop
 pseudo-device	ether
 pseudo-device	sl	1
-#pseudo-device	ppp	1
+pseudo-device	ppp	1
 pseudo-device	tun	1
 pseudo-device	pty	16
 pseudo-device	gzip		# Exec gzipped a.out's
@@ -189,4 +192,10 @@ options		KTRACE		#kernel tracing
 
 # This provides support for System V shared memory.
 #
-options         SYSVSHM  
+options		SYSVSHM
+
+#  The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
+#  aware of the legal and administrative consequences of enabling this
+#  option.  The number of devices determines the maximum number of
+#  simultaneous BPF clients programs runnable.
+#pseudo-device	bpfilter	4	#Berkeley packet filter