Index: head/sys/mips/conf/AP94
===================================================================
--- head/sys/mips/conf/AP94	(revision 344478)
+++ head/sys/mips/conf/AP94	(revision 344479)
@@ -1,37 +1,36 @@
 #
 # Specific board setup for the Atheros AP94 reference board.
 #
 # The AP94 has the following hardware:
 #
 # + AR7161 CPU SoC
 # + AR9223 2.4GHz 11n
 # + AR9220 5GHz 11n
 # + AR8216 10/100 switch
 # + m25p64 based 8MB flash
 # + 32mb RAM
 # + uboot environment
 
 # $FreeBSD$
 
 #NO_UNIVERSE
 
 include		"AR71XX_BASE"
 ident		"AP94"
 hints		"AP94.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 options 	AR71XX_REALMEM=32*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # options 	MD_ROOT
 # options 	MD_ROOT_SIZE="6144"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
Index: head/sys/mips/conf/DIR-825B1
===================================================================
--- head/sys/mips/conf/DIR-825B1	(revision 344478)
+++ head/sys/mips/conf/DIR-825B1	(revision 344479)
@@ -1,66 +1,65 @@
 #
 # Specific board setup for the D-Link DIR-825B1 router.
 #
 # The DIR-825B1 has the following hardware:
 #
 # + AR7161 CPU SoC
 # + AR9223 2.4GHz 11n
 # + AR9220 5GHz 11n
 # + RealTek RTL8366S Gigabit switch
 # + m25p64 based 8MB flash
 # + 64MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
 #NO_UNIVERSE
 
 include		"AR71XX_BASE"
 ident		"DIR-825B1"
 hints		"DIR-825B1.hints"
 
 # Since the kernel image must fit inside 1024KiB, we have to build almost
 # everything as modules.
 # nodevice random
 nodevice gpio
 nodevice gpioled
 nodevice gif
 nodevice gre
 nodevice if_bridge
 nodevice usb
 nodevice ehci
 nodevice wlan
 nodevice wlan_xauth
 nodevice wlan_acl
 nodevice wlan_wep
 nodevice wlan_tkip
 nodevice wlan_ccmp
 nodevice wlan_rssadapt
 nodevice wlan_amrr
 nodevice ath
 nodevice ath_pci
 nodevice ath_hal
 nodevice umass
 nodevice ath_rate_sample
 
 nooptions	INET6
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 options 	GEOM_PART_GPT
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 # options 	MSDOSFS			# Read MSDOS filesystems; useful for USB/CF
 
 # options 	MD_ROOT
 # options 	MD_ROOT_SIZE="6144"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
Index: head/sys/mips/conf/ROUTERSTATION_MFS
===================================================================
--- head/sys/mips/conf/ROUTERSTATION_MFS	(revision 344478)
+++ head/sys/mips/conf/ROUTERSTATION_MFS	(revision 344479)
@@ -1,21 +1,20 @@
 #
 # Ubiquiti Routerstation: boot from MFS
 #
 # $FreeBSD$
 #
 
 #NO_UNIVERSE
 
 include		"AR71XX_BASE"
 ident		"ROUTERSTATION_MFS"
 hints		"ROUTERSTATION.hints"
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 options 	MD_ROOT
 options 	MD_ROOT_SIZE="6144"
Index: head/sys/mips/conf/RSPRO_MFS
===================================================================
--- head/sys/mips/conf/RSPRO_MFS	(revision 344478)
+++ head/sys/mips/conf/RSPRO_MFS	(revision 344479)
@@ -1,25 +1,24 @@
 #
 # Ubiquiti Routerstation Pro: boot from MFS
 #
 # $FreeBSD$
 #
 
 #NO_UNIVERSE
 
 include		"AR71XX_BASE"
 ident		"RSPRO_MFS"
 hints		"RSPRO.hints"
 
 # RTC - requires hackery in the spibus code to work
 device		pcf2123_rtc
 
 # GEOM modules
 device		geom_redboot	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
 options 	GEOM_UZIP
 
 # Boot from the first MFS uzip
 options 	ROOTDEVNAME=\"ufs:md0.uzip\"
 
 options 	MD_ROOT
 options 	MD_ROOT_SIZE="6144"
Index: head/sys/mips/conf/WZR-300HP
===================================================================
--- head/sys/mips/conf/WZR-300HP	(revision 344478)
+++ head/sys/mips/conf/WZR-300HP	(revision 344479)
@@ -1,51 +1,51 @@
 #
 # Specific board setup for the Buffalo Airstation WZR-300HP
 #
 # The WZR-300HP has the following hardware:
 #
 # + AR7242 CPU SoC
 # + AR9280 5GHz 11n
 # + AR8136 Gigabit switch
 # + 2 m25ll128 based 16MB flash
 # + 64MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
 #NO_UNIVERSE
 
 include		"std.AR724X"
 ident		"WZR-300HP"
 hints		"WZR-300HP.hints"
 
 options 	AR71XX_REALMEM=64*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 options 	BOOTVERBOSE
 
 # GEOM modules
 device		geom_map	# to get access to the SPI flash partitions
-device		geom_uzip	# compressed in-memory filesystem hackery!
+options		GEOM_UZIP
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options         ARGE_MDIO               # Export an MDIO bus separate from arge
 device          miiproxy                # MDIO bus <-> MII PHY rendezvous
 
 device          etherswitch
 device          arswitch
 
 # hwpmc
 device		hwpmc_mips24k
 device		hwpmc
 
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
 nodevice	random
Index: head/sys/mips/conf/WZR-HPAG300H
===================================================================
--- head/sys/mips/conf/WZR-HPAG300H	(revision 344478)
+++ head/sys/mips/conf/WZR-HPAG300H	(revision 344479)
@@ -1,51 +1,51 @@
 #
 # Specific board setup for the Buffalo Airstation WZR-HPAG300H
 #
 # The WZR-HPAG300H has the following hardware:
 #
 # + AR7161 CPU SoC
 # + 2x AR9280 5GHz 11n
 # + AR8136 Gigabit switch
 # + 2 m25ll128(really w25q128)  based 16MB flash
 # + 128MB RAM
 # + uboot environment
 
 # $FreeBSD$
 
 #NO_UNIVERSE
 
 include		"AR71XX_BASE"
 ident		"WZR-HPAG300H"
 hints		"WZR-HPAG300H.hints"
 
 options 	AR71XX_REALMEM=128*1024*1024
 
 options 	AR71XX_ENV_UBOOT
 
 options 	BOOTVERBOSE
 
 # GEOM modules
-device		geom_uzip	# compressed in-memory filesystem hackery!
+options		GEOM_UZIP
 device		geom_map	# to get access to the SPI flash partitions
 
 options 	ROOTDEVNAME=\"ufs:/dev/map/rootfs.uzip\"
 
 options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
 options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
 device		firmware		# Used by the above
 
 # Options required for miiproxy and mdiobus
 options         ARGE_MDIO               # Export an MDIO bus separate from arge
 device          miiproxy                # MDIO bus <-> MII PHY rendezvous
 
 device          etherswitch
 device          arswitch
 
 # hwpmc
 device		hwpmc_mips24k
 device		hwpmc
 
 # load these via modules, shrink kernel
 nodevice	if_bridge
 nodevice	bridgestp
 nodevice	random