--- elwix/config/Attic/ELWIX	2011/07/05 23:43:00	1.1.1.1
+++ elwix/config/Attic/ELWIX	2011/10/20 11:28:32	1.2.2.4
@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.550 2011/06/14 20:30:49 hselasky Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.556 2011/10/19 21:55:20 kensmith Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -40,7 +40,7 @@ options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options		MD_ROOT_SIZE=5120
 options 	NFSLOCKD		# Network Lock Manager
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
@@ -59,6 +59,8 @@ options		GEOM_RAID3
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
 options		GEOM_NOP
+options 	GEOM_AES		# Don't use, use GEOM_BDE
+options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -164,6 +166,7 @@ device		iir		# Intel Integrated RAID
 device		ips		# IBM (Adaptec) ServeRAID
 device		mly		# Mylex AcceleRAID/eXtremeRAID
 device		twa		# 3ware 9000 series PATA/SATA RAID
+device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
 
 # RAID controllers
 device		aac		# Adaptec FSA RAID
@@ -213,10 +216,8 @@ device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da
 
-# If you've got a "dumb" serial or parallel PCI card that is
-# supported by the puc(4) glue driver, uncomment the following
-# line to enable it (connects to sio, uart and/or ppc drivers):
-device		puc
+device		puc		# Multi I/O cards and multi-channel UARTs
+device		mos
 
 # PCI Ethernet NICs.
 device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
@@ -370,11 +371,12 @@ device		uath		# Atheros AR5523 wireless NICs
 device		upgt		# Conexant/Intersil PrismGT wireless NICs.
 device		ural		# Ralink Technology RT2500USB wireless NICs
 device		urtw		# Realtek RTL8187B/L wireless NICs
-device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
+device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
 
 # FireWire support
 device		firewire	# FireWire bus code
-device		sbp		# SCSI over FireWire (Requires scbus and da)
+# sbp(4) works for some systems but causes boot failure on others
+#device		sbp		# SCSI over FireWire (Requires scbus and da)
 device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC 2734,3146)
 device		dcons		# Dumb console driver
@@ -484,8 +486,9 @@ device		smb
 device		smbus
 device		iicbus
 device		iicbb
-#device		bktr
-#options		BKTR_NEW_MSP34XX_DRIVER
+device		bktr
+options		BKTR_NEW_MSP34XX_DRIVER
+options		BKTR_KODICOM_MUX
 device		speaker
 
 device		gpio
@@ -506,6 +509,7 @@ device		ichwd
 #device		ef
 device		cas
 device		cxgb
+device		vxge
 device		disc
 device		edsc
 device		epair
@@ -515,6 +519,8 @@ device		mxge
 device		my
 device		nxge
 device		stf
+
+device		netmap
 
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS