Index: head/sys/arm/conf/ATMEL
===================================================================
--- head/sys/arm/conf/ATMEL
+++ head/sys/arm/conf/ATMEL
@@ -145,7 +145,6 @@
 
 # USB device (gadget) support
 device		at91_dci		# Atmel's usb device
-device		usfs			# emulate a flash
 device		cdce			# emulate an ethernet
 device		usb_template		# Control of the gadget
 
Index: head/sys/arm/conf/BEAGLEBONE
===================================================================
--- head/sys/arm/conf/BEAGLEBONE
+++ head/sys/arm/conf/BEAGLEBONE
@@ -114,9 +114,8 @@
 # USB Ethernet support, requires miibus
 device		miibus
 
-# Device mode support and USFS template
+# Device mode support
 device		usb_template    	# Control of the gadget
-device		usfs
 
 # Pinmux
 device		fdt_pinctrl
Index: head/sys/arm/conf/EB9200
===================================================================
--- head/sys/arm/conf/EB9200
+++ head/sys/arm/conf/EB9200
@@ -111,7 +111,6 @@
 
 # USB device (gadget) support
 #device		at91_dci		# Atmel's usb device
-#device		usfs			# emulate a flash
 #device		cdce			# emulate an ethernet
 #device		usb_template		# Control of the gadget
 
Index: head/sys/arm/conf/GENERIC
===================================================================
--- head/sys/arm/conf/GENERIC
+++ head/sys/arm/conf/GENERIC
@@ -183,9 +183,8 @@
 device		uhid			# "Human Interface Devices"
 device		ukbd			# Allow keyboard like HIDs to control console
 
-# Device mode support and USFS template
+# Device mode support
 device		usb_template    	# Control of the gadget
-device		usfs
 
 # Ethernet
 device		loop
Index: head/sys/arm/conf/KB920X
===================================================================
--- head/sys/arm/conf/KB920X
+++ head/sys/arm/conf/KB920X
@@ -153,7 +153,6 @@
 
 # USB device (gadget) support
 device		at91_dci		# Atmel's usb device
-device		usfs			# emulate a flash
 device		cdce			# emulate an ethernet
 device		usb_template		# Control of the gadget