--- elwix/config/ELWIX_i386	2013/07/17 15:01:44	1.1.2.1
+++ elwix/config/ELWIX_i386	2013/07/18 00:11:25	1.1.2.2
@@ -1,5 +1,5 @@
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.583 2013/01/14 00:28:54 svnexp Exp $
-# $Id: ELWIX_i386,v 1.1.2.1 2013/07/17 15:01:44 misho Exp $
+# $Id: ELWIX_i386,v 1.1.2.2 2013/07/18 00:11:25 misho Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
 cpu		I586_CPU
@@ -115,7 +115,6 @@ device		fdc
 # ATA controllers
 device		ahci		# AHCI-compatible SATA controllers
 device		ata		# Legacy ATA/SATA controllers
-options 	ATA_CAM		# Handle legacy controllers with CAM
 options 	ATA_STATIC_ID	# Static device numbering
 device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
 device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA
@@ -166,6 +165,7 @@ device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RA
 device		ciss		# Compaq Smart RAID 5*
 device		dpt		# DPT Smartcache III, IV - See NOTES for options
 device		hptmv		# Highpoint RocketRAID 182x
+device		hptnr		# Highpoint DC7280, R750
 device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
 device		hpt27xx		# Highpoint RocketRAID 27xx
 device		iir		# Intel Integrated RAID
@@ -177,6 +177,7 @@ device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID cont
 # RAID controllers
 device		aac		# Adaptec FSA RAID
 device		aacp		# SCSI passthrough for aac (requires CAM)
+device		aacraid		# Adaptec by PMC RAID
 device		ida		# Compaq Smart RAID
 device		mfi		# LSI MegaRAID SAS
 device		mlx		# Mylex DAC960 family
@@ -219,7 +220,6 @@ device		uart		# Generic UART driver
 device		ppc
 device		ppbus		# Parallel port bus (required)
 device		lpt		# Printer
-device		plip		# TCP/IP over parallel
 device		ppi		# Parallel port interface device
 #device		vpo		# Requires scbus and da