--- elwix/config/ELWIX_i386	2014/06/12 23:02:53	1.4.2.6
+++ elwix/config/ELWIX_i386	2014/09/15 19:06:42	1.5
@@ -1,5 +1,5 @@
-# $Id: ELWIX_i386,v 1.4.2.6 2014/06/12 23:02:53 misho Exp $
-# $FreeBSD: head/sys/i386/conf/GENERIC 267146 2014-06-06 04:08:55Z imp $
+# $Id: ELWIX_i386,v 1.5 2014/09/15 19:06:42 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
@@ -178,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
 
@@ -197,7 +196,11 @@ 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