--- elwix/config/ELWIX_i386	2014/01/07 13:46:49	1.4.2.3
+++ elwix/config/ELWIX_i386	2014/09/08 17:23:16	1.4.2.8
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.4.2.3 2014/01/07 13:46:49 misho Exp $
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
+# $Id: ELWIX_i386,v 1.4.2.8 2014/09/08 17:23:16 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -30,8 +30,6 @@ options 	QUOTA			# Enable disk quotas for UFS
 options 	MD_ROOT			# MD is a potential root device
 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 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
@@ -104,7 +102,6 @@ device		cpufreq
 
 # Bus support.
 device		acpi
-device		eisa
 device		pci
 
 # Floppy drives
@@ -118,7 +115,6 @@ device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC 
 device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
 
 # SCSI Controllers
-device		ahb		# EISA AHA1742 family
 device		ahc		# AHA2940 and onboard AIC7xxx devices
 options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
 					# output.  Adds ~128k to driver.
@@ -131,6 +127,7 @@ device		isp		# Qlogic family
 #device		ispfw		# Firmware for QLogic HBAs- normally a module
 device		mpt		# LSI-Logic MPT-Fusion
 device		mps		# LSI-Logic MPT-Fusion 2
+device		mpr		# LSI-Logic MPT-Fusion 3
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 device		trm		# Tekram DC395U/UW/F DC315U adapters
@@ -179,6 +176,7 @@ device		aacraid		# Adaptec by PMC RAID
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
+device		mrsas		# LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
 device		pst		# Promise Supertrak SX6000
 device		twe		# 3ware ATA RAID
 
@@ -198,8 +196,12 @@ device		splash		# Splash screen and screen saver suppo
 device		sc
 options 	SC_PIXEL_MODE	# add support for the raster text mode
 
-device		agp		# support several AGP chipsets
+# vt is the new video console driver
+device		vt
+device		vt_vga
 
+device		agp			# support several AGP chipsets
+
 # Power management support (see NOTES for more options)
 #device		apm
 # Add suspend/resume support for the i8254.
@@ -263,7 +265,6 @@ device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
 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
@@ -440,7 +441,7 @@ device		vmx		# VMware VMXNET3 Ethernet
 
 ### ELWIX Additional custom settings ...
 
-device		iscsi_initiator
+#device		iscsi_initiator
 
 device		if_bridge
 device		tap