--- elwix/config/Attic/ELWIX	2012/05/21 11:24:31	1.3.2.8
+++ elwix/config/Attic/ELWIX	2012/05/30 07:07:44	1.3.2.11
@@ -28,9 +28,6 @@ options 	INIT_PATH=/sbin/initx:/sbin/init
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 #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
 options 	INET			# InterNETworking
@@ -46,7 +43,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
@@ -55,7 +51,6 @@ options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
-options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_UZIP
 options         GEOM_ELI
@@ -65,7 +60,6 @@ options		GEOM_STRIPE
 options		GEOM_VIRSTOR
 options		GEOM_CACHE
 options		GEOM_MULTIPATH
-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
@@ -431,7 +425,7 @@ device		carp
 
 device		siba_bwn
 
-#options		NDISAPI
+options		NDISAPI
 #device		ndis
 
 device		pf
@@ -517,7 +511,7 @@ options		VFS_AIO
 device		ic
 device		iic
 device		iicsmb
-device		iicoc		# OpenCores I2C controller support
+#device		iicoc		# OpenCores I2C controller support
 device		smb
 device		smbus
 device		iicbus
@@ -540,12 +534,9 @@ device		amdsmb
 device		nfpm
 device		nfsmb
 
-device		smb
 device		ipmi
 device		pcf
 
-device		mos
-
 device		gpio
 device		gpioled
 device		gpioiic
@@ -554,8 +545,6 @@ device		glxsb
 device		glxiic
 options		CPU_GEODE
 options		CPU_SOEKRIS
-options		CPU_ELAN
-options		CPU_ELAN_PPS
 options		COMPAT_AOUT
 options 	ENABLE_ALART		# Control alarm on Intel intpm driver
 options 	PANIC_REBOOT_WAIT_TIME=10
@@ -569,13 +558,13 @@ device		wbwd
 
 #device		disc
 #device		edsc
+#options		VIMAGE
 device		epair
 device		stf
 
 # NETMAP subsystem
-device		netmap
+###device		netmap
 
-device		mdio
 device		rlswitch
 
 options 	ACCEPT_FILTER_DATA
@@ -584,6 +573,3 @@ options 	ACCEPT_FILTER_HTTP
 
 options 	ZERO_COPY_SOCKETS
 options 	SW_WATCHDOG
-
-options 	RACCT
-options 	RCTL