Index: head/sys/mips/conf/DIR-825B1
===================================================================
--- head/sys/mips/conf/DIR-825B1	(revision 336031)
+++ head/sys/mips/conf/DIR-825B1	(revision 336032)
@@ -1,73 +1,66 @@
 #
 # 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
 
-# Don't include the SCSI/CAM strings in the default build
-options 	SCSI_NO_SENSE_STRINGS
-options 	SCSI_NO_OP_STRINGS
-
-# .. And no sysctl strings
-options 	NO_SYSCTL_DESCR
-
 # 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