--- elwix/config/Attic/ELWIX	2012/02/10 01:55:48	1.3.2.2
+++ elwix/config/Attic/ELWIX	2012/02/23 09:39:37	1.3.2.5
@@ -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.556 2011/10/19 21:55:20 kensmith Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.562 2012/01/31 19:38:18 jimharris Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -229,19 +229,22 @@ device		puc		# Multi I/O cards and multi-channel UARTs
 
 # PCI Ethernet NICs.
 device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
-device		cxgbe		# Chelsio T4 10GbE PCIe adapter
 device		de		# DEC/Intel DC21x4x (``Tulip'')
-device		em		# Intel Pro/1000 Gigabit Ethernet
-device		igb		# Intel Pro/1000 PCIE Gigabit Ethernet
-device		ixgb		# Intel Pro/10Gbe PCI-X Ethernet
-device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
+device		em		# Intel PRO/1000 Gigabit Ethernet Family
+device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
+device		ixgb		# Intel PRO/10GbE Ethernet Card
 device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
-device		mxge		# Myricom Myri-10G 10GbE NIC
-device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter
 device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
 device		txp		# 3Com 3cR990 (``Typhoon'')
 device		vx		# 3Com 3c590, 3c595 (``Vortex'')
-device		vxge		# Exar/Neterion XFrame 3100 10GbE
+#device		vxge		# Exar/Neterion XFrame 3100 10GbE
+#device		mxge		# Myricom Myri-10G 10GbE NIC
+#device		nxge		# Neterion Xframe 10GbE Server/Storage Adapter
+#device		ixgbe		# Intel Pro/10Gbe PCIE Ethernet
+#device		cxgbe		# Chelsio T4 10GbE PCIe adapter
+#device		cxgb		# Chelsio T3 10 Gigabit Ethernet
+#device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
+#device		my		# Myson Fast Ethernet (MTD80X, MTD89X)
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
@@ -253,19 +256,18 @@ device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
-device		cxgb		# Chelsio T3 10 Gigabit Ethernet
-device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware
 device		dc		# DEC/Intel 21143 and various workalikes
 device		et		# Agere ET1310 10/100/Gigabit Ethernet
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
-device		my		# Myson Fast Ethernet (MTD80X, MTD89X)
+device		nfe		# nVidia nForce MCP on-board Ethernet
 device		nge		# NatSemi DP83820 gigabit Ethernet
+#device		nve		# nVidia nForce MCP on-board Ethernet Networking
+device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
-device		pcn		# AMD Am79C97x PCI 10/100 NICs
 device		sf		# Adaptec AIC-6915 (``Starfire'')
 device		sge		# Silicon Integrated Systems SiS190/191
 device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
@@ -274,15 +276,12 @@ device		ste		# Sundance ST201 (D-Link DFE-550TX)
 device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
 device		tl		# Texas Instruments ThunderLAN
 device		tx		# SMC EtherPower II (83c170 ``EPIC'')
+device		vge		# VIA VT612x gigabit Ethernet
 device		vr		# VIA Rhine, Rhine II
 device		vte		# DM&P Vortex86 RDC R6040 Fast Ethernet
 device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
-device		nfe		# nVidia nForce MCP on-board Ethernet
-#device		nve		# nVidia nForce MCP on-board Ethernet Networking
-device		vge		# VIA VT612x gigabit Ethernet
-
 # ISA Ethernet NICs.  pccard NICs included.
 device		cs		# Crystal Semiconductor CS89x0 NIC
 # 'device ed' requires 'device miibus'
@@ -542,12 +541,13 @@ device		ichwd
 device		amdsbwd
 device		viawd
 
-device		disc
-device		edsc
+#device		disc
+#device		edsc
 device		epair
 device		stf
 
-device		netmap
+# NETMAP subsystem
+#device		netmap
 
 options 	ACCEPT_FILTER_DATA
 options 	ACCEPT_FILTER_DNS