--- elwix/config/Attic/ELWIX	2011/07/05 23:43:00	1.1.1.1
+++ elwix/config/Attic/ELWIX	2011/09/17 10:30:12	1.1.1.1.2.1
@@ -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.553 2011/09/11 17:39:51 brueffer Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -39,8 +39,9 @@ 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 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 +60,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
@@ -370,7 +373,7 @@ 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