--- elwix/config/Attic/ELWIX	2011/10/20 09:29:00	1.2.2.3
+++ elwix/config/Attic/ELWIX	2011/10/31 13:15:19	1.2.2.6
@@ -84,8 +84,11 @@ options 	FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 
-# Debugging for use in -current
+# Debugging support.  Always need this:
 #options 	KDB			# Enable kernel debugger support.
+# For minimum debugger support (stable branch) use:
+#options 	KDB_TRACE		# Print a stack trace for a panic.
+# For full debugger support use this instead:
 #options 	DDB			# Support DDB.
 #options 	GDB			# Support remote GDB.
 #options 	DEADLKRES		# Enable the deadlock resolver
@@ -488,6 +491,7 @@ device		iicbus
 device		iicbb
 device		bktr
 options		BKTR_NEW_MSP34XX_DRIVER
+options		BKTR_KODICOM_MUX
 device		speaker
 
 device		gpio
@@ -519,7 +523,7 @@ device		my
 device		nxge
 device		stf
 
-device		netmap
+#device		netmap
 
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS