--- elwix/config/ELWIX_i386	2014/01/07 08:41:29	1.4.2.2
+++ elwix/config/ELWIX_i386	2014/05/26 22:29:09	1.4.2.5
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.4.2.2 2014/01/07 08:41:29 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.5 2014/05/26 22:29:09 misho Exp $
+# $FreeBSD: head/sys/i386/conf/GENERIC 265236 2014-05-02 20:25:09Z ken $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -104,7 +104,6 @@ device		cpufreq
 
 # Bus support.
 device		acpi
-device		eisa
 device		pci
 
 # Floppy drives
@@ -118,7 +117,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 +129,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
@@ -263,7 +262,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
@@ -439,6 +437,8 @@ device		xenpci		# Xen HVM Hypervisor services driver
 device		vmx		# VMware VMXNET3 Ethernet
 
 ### ELWIX Additional custom settings ...
+
+#device		iscsi_initiator
 
 device		if_bridge
 device		tap