--- elwix/config/ELWIX_i386	2013/07/18 00:11:25	1.1.2.2
+++ elwix/config/ELWIX_i386	2013/07/18 00:19:30	1.1.2.6
@@ -1,4 +1,4 @@
-# $Id: ELWIX_i386,v 1.1.2.2 2013/07/18 00:11:25 misho Exp $
+# $Id: ELWIX_i386,v 1.1.2.6 2013/07/18 00:19:30 misho Exp $
 # $FreeBSD: src/sys/i386/conf/GENERIC,v 1.590 2013/07/07 00:29:29 svnexp Exp $
 
 cpu		I486_CPU
@@ -42,12 +42,10 @@ options 	GEOM_RAID		# Soft RAID functionality.
 options 	GEOM_LABEL		# Provides labelization
 options 	GEOM_GATE
 options 	GEOM_UZIP
-options 	GEOM_REDBOOT
 device		geom_redboot
 device		geom_map	# to get access to the SPI flash partitions
 device		geom_uncompress	# compressed in-memory filesystem hackery!
 device		geom_uzip	# compressed in-memory filesystem support
-options 	GEOM_MAP
 options		GEOM_UNCOMPRESS
 options         GEOM_ELI
 options         GEOM_MIRROR
@@ -300,6 +298,8 @@ device		wlan_acl
 device		wlan_xauth
 device		wlan_rssadapt
 #options	AH_RXCFG_SDMAMW_4BYTES
+#options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+options		ALQ
 options		IEEE80211_ALQ
 options		IEEE80211_SUPPORT_TDMA
 options		IEEE80211_SUPPORT_SUPERG
@@ -430,7 +430,6 @@ device		virtio_balloon	# VirtIO Memory Balloon device
 ### ELWIX Additional custom settings ...
 
 device		if_bridge
-device		bridgestp
 device		tap
 device		gre
 device		lagg