--- elwix/config/Attic/ELWIX	2011/09/17 10:30:12	1.1.1.1.2.1
+++ elwix/config/Attic/ELWIX	2011/10/20 09:19:24	1.2.2.2
@@ -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.553 2011/09/11 17:39:51 brueffer Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.554 2011/10/04 21:40:25 delphij Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -39,7 +39,6 @@ options 	MD_ROOT			# MD is a potential root device
 options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options		MD_ROOT_SIZE=5120
-options 	NFSSERVER		#Network File System server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -167,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
@@ -487,8 +487,8 @@ device		smb
 device		smbus
 device		iicbus
 device		iicbb
-#device		bktr
-#options		BKTR_NEW_MSP34XX_DRIVER
+device		bktr
+options		BKTR_NEW_MSP34XX_DRIVER
 device		speaker
 
 device		gpio
@@ -518,6 +518,8 @@ device		mxge
 device		my
 device		nxge
 device		stf
+
+device		netmap
 
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS