Index: head/sys/arm/conf/ARMADA38X
===================================================================
--- head/sys/arm/conf/ARMADA38X	(revision 340455)
+++ head/sys/arm/conf/ARMADA38X	(revision 340456)
@@ -1,107 +1,106 @@
 #
 # Kernel configuration for Marvell Armada38x
 #
 # $FreeBSD$
 #
 
 include 	"../mv/armada38x/std.armada38x"
 include 	"std.armv7"
 
 ident 	ARMADA38X
 
 options 	SOC_MV_ARMADA38X
 
 makeoptions 	WERROR="-Werror"
 makeoptions 	MODULES_EXTRA="dtb/mv"
 
-options 	MD_ROOT
+#options 	MD_ROOT
 #makeoptions 	MFS_IMAGE=/path/to/miniroot
 #options 	ROOTDEVNAME=\"ufs:md0\"
 options 	ROOTDEVNAME=\"/dev/da0s1a\"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	SMP
 
 options		VM_KMEM_SIZE_MAX=0x9CCD000
 
 # Pseudo devices
 device		random
 device		pty
 device		loop
 device		md
 
 # Serial ports
 device		uart
 device		uart_snps
 
 # Network
 device		ether
 device		vlan
 device		mii
 device		bpf
-device		re
 device		mdio
 device		etherswitch
 device		e6000sw
 device		neta
 
 # PCI
 device		pci
 
 # Interrupt controllers
 device		gic
 
 # Timers
 device		mpcore_timer
 
 # USB
 device		usb
 device		ehci
 device		xhci
 device		umass
 device		scbus
 device		pass
 device		da
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		sdhci			# mmc/sd host controller
 
 # SATA
 device		ahci
 
 # I2C
 device		iic
 device		iicbus
 device		twsi
 
 # SPI
 device		spibus
 device		spigen
 device		mv_spi
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
 device		ath		# Atheros NIC's
 device		ath_pci		# Atheros pci/cardbus glue
 device		ath_hal
 device		ath_rate_sample
 options		ATH_ENABLE_11N
 
 # CESA
 device		cesa
 device		crypto
 device		cryptodev
 
 # L2 Cache
 device		pl310
 
 options		PLATFORM
 
 # FDT
 options 	FDT
 
 # GPIO
 device gpio
 device gpioled