--- elwix/config/ELWIX_amd64	2016/12/23 08:32:23	1.1.2.5
+++ elwix/config/ELWIX_amd64	2016/12/27 10:06:10	1.1.2.6
@@ -1,4 +1,4 @@
-# $Id: ELWIX_amd64,v 1.1.2.5 2016/12/23 08:32:23 misho Exp $
+# $Id: ELWIX_amd64,v 1.1.2.6 2016/12/27 10:06:10 misho Exp $
 # $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $
 
 cpu		HAMMER
@@ -45,7 +45,6 @@ options 	GEOM_UZIP
 #device		geom_redboot
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uzip	# compressed in-memory filesystem support
-options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
 options		GEOM_CONCAT
@@ -296,7 +295,6 @@ device		sn		# SMC's 9000 series of Ethernet chips
 device		xe		# Xircom pccard Ethernet
 
 options		XBONEHACK
-options		WLCACHE
 device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
@@ -429,7 +427,7 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
-# HyperV drivers and enhancement support
+# HyperV drivers and enchancement support
 device		hyperv			# HyperV drivers 
 
 # Xen HVM Guest Optimizations
@@ -463,9 +461,7 @@ device		hifn
 device		enc
 device		crypto
 device		cryptodev
-options		IPSEC
 options		IPSEC_NAT_T
-options		IPSEC_FILTERTUNNEL
 
 options		ALTQ
 options		ALTQ_CBQ
@@ -583,11 +579,11 @@ device		wbwd
 #device		disc
 #device		edsc
 options		VIMAGE
-device		epair
+#device		epair
 device		stf
 
 # NETMAP subsystem
-#device		netmap
+device		netmap
 
 device		rlswitch