--- elwix/config/Attic/ELWIX	2012/05/21 11:24:31	1.3.2.8
+++ elwix/config/Attic/ELWIX	2012/05/28 22:05:11	1.3.2.9
@@ -29,7 +29,6 @@ makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug
 #makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
 
 device		hwpmc			# Driver (also a loadable module)
-options 	HWPMC_HOOKS		# Other necessary kernel hooks
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
@@ -46,7 +45,6 @@ options 	NFSCL			# New Network Filesystem Client
 options 	NFSD			# New Network Filesystem Server
 options 	NFSCLIENT		#Network File System client
 options 	NFSSERVER		#Network File System server
-options 	NFSLOCKD		#Network Lock Manager
 options		MD_ROOT_SIZE=8000
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
@@ -65,7 +63,8 @@ options		GEOM_STRIPE
 options		GEOM_VIRSTOR
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
-options 	GEOM_AES		# Don't use, use GEOM_BDE
+options 	GEOM_MBR
+options 	GEOM_BSD
 options 	GEOM_LINUX_LVM		# Linux LVM2 volumes
 options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
@@ -540,12 +539,9 @@ device		amdsmb
 device		nfpm
 device		nfsmb
 
-device		smb
 device		ipmi
 device		pcf
 
-device		mos
-
 device		gpio
 device		gpioled
 device		gpioiic
@@ -575,7 +571,6 @@ device		stf
 # NETMAP subsystem
 device		netmap
 
-device		mdio
 device		rlswitch
 
 options 	ACCEPT_FILTER_DATA