- Use "device\t" and "options \t" for consistency.

15 files changed, 238 insertions, 238 deletions

diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA
index cd1d338..826dea2 100644
--- a/sys/arm/conf/AVILA
+++ b/sys/arm/conf/AVILA
@@ -99,12 +99,12 @@ device		loop
 device		if_bridge
 
 device		md
-device          random          # Entropy device
+device		random		# Entropy device
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
-options		IEEE80211_DEBUG
-options		IEEE80211_SUPPORT_TDMA
+options 	IEEE80211_DEBUG
+options 	IEEE80211_SUPPORT_TDMA
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
@@ -112,12 +112,12 @@ device		wlan_xauth
 
 device		ath		# Atheros pci/cardbus NIC's
 options 	ATH_DEBUG
-options		ATH_DIAGAPI
-#options		ATH_TX99_DIAG
+options 	ATH_DIAGAPI
+#options 	ATH_TX99_DIAG
 device		ath_rate_sample	# SampleRate tx rate control for ath
 
-#options		AH_DEBUG
-#options		AH_ASSERT
+#options 	AH_DEBUG
+#options 	AH_ASSERT
 #device		ath_ar5210
 #device		ath_ar5211
 device		ath_ar5212
@@ -129,7 +129,7 @@ device		ath_rf5112
 device		ath_rf5413
 #
 device		ath_ar5416
-options		AH_SUPPORT_AR5416
+options 	AH_SUPPORT_AR5416
 device		ath_ar9160
 
 makeoptions	WITH_LEGACY
diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index 8b8ca11..b92e626 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -19,9 +19,9 @@
 
 ident		BWCT
 
-options	VERBOSE_INIT_ARM
+options 	VERBOSE_INIT_ARM
 
-options		AT91_BWCT
+options 	AT91_BWCT
 include		"../at91/std.bwct"
 
 #To statically compile in device wiring instead of /boot/device.hints
@@ -30,8 +30,8 @@ hints		"BWCT.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 options 	BREAK_TO_DEBUGGER
 options 	ALT_BREAK_TO_DEBUGGER
 
@@ -43,15 +43,15 @@ options 	SOFTUPDATES		#Enable FFS soft updates support
 #options 	UFS_ACL			#Support for access control lists
 #options 	UFS_DIRHASH		#Improve performance on big directories
 #options 	MD_ROOT			#MD is a potential root device
-#options	MD_ROOT_SIZE=4096	# 3MB ram disk
+#options 	MD_ROOT_SIZE=4096	# 3MB ram disk
 #options 	ROOTDEVNAME=\"ufs:md0\"
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
-options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options		BOOTP_NFSROOT
-options		BOOTP
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	BOOTP_NFSROOT
+options 	BOOTP
 
 #options 	MSDOSFS			#MSDOS Filesystem
 #options 	CD9660			#ISO 9660 Filesystem
@@ -65,7 +65,7 @@ options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 #options 	SYSCTL_OMIT_DESCR
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 device		loop
@@ -83,7 +83,7 @@ device		rlswitch
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options	DIAGNOSTIC
+#options 	DIAGNOSTIC
 
 device		md
 device		at91_twi		# TWI: Two Wire Interface
diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA
index 70655de..8375a74 100644
--- a/sys/arm/conf/CAMBRIA
+++ b/sys/arm/conf/CAMBRIA
@@ -68,7 +68,7 @@ device		uart
 
 device		ixpwdog		# watchdog timer
 
-options		IXP4XX_FLASH_SIZE=0x02000000	# stock 2358 comes w/ 32M
+options 	IXP4XX_FLASH_SIZE=0x02000000	# stock 2358 comes w/ 32M
 device		cfi		# flash support
 device		cfid		# flash disk support
 device		geom_redboot	# redboot fis parser
@@ -86,7 +86,7 @@ device		cambria_fled	# Font Panel LED on I2C bus
 device		cambria_led	# 8-LED latch
 
 device		ata
-device		atadisk         # ATA disk drives
+device		atadisk		# ATA disk drives
 device		avila_ata	# Gateworks CF/IDE support
 
 device		npe		# Network Processing Engine
@@ -102,12 +102,12 @@ device		loop
 device		if_bridge
 
 device		md
-device          random          # Entropy device
+device		random		# Entropy device
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
-options		IEEE80211_DEBUG
-options		IEEE80211_SUPPORT_TDMA
+options 	IEEE80211_DEBUG
+options 	IEEE80211_SUPPORT_TDMA
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
@@ -115,13 +115,13 @@ device		wlan_xauth
 
 device		ath		# Atheros pci/cardbus NIC's
 options 	ATH_DEBUG
-options		ATH_DIAGAPI
-#options		ATH_TX99_DIAG
+options 	ATH_DIAGAPI
+#options 	ATH_TX99_DIAG
 device		ath_rate_sample	# SampleRate tx rate control for ath
 
-options		AH_DEBUG
-#options		AH_ASSERT
-options		AH_PRIVATE_DIAG
+options 	AH_DEBUG
+#options 	AH_ASSERT
+options 	AH_PRIVATE_DIAG
 #device		ath_ar5210
 #device		ath_ar5211
 #
@@ -133,7 +133,7 @@ device		ath_rf5112
 device		ath_rf5413
 #
 #device		ath_ar5416
-#options		AH_SUPPORT_AR5416	# NB: for 11n descriptor format
+#options 	AH_SUPPORT_AR5416	# NB: for 11n descriptor format
 #device		ath_rf2133
 #device		ath_ar9160
 #device		ath_ar9280
@@ -142,8 +142,8 @@ device		ath_rf5413
 
 # NB: 2 USB 2.0 ports standard
 device		usb
-options		USB_EHCI_BIG_ENDIAN_DESC	# handle big-endian byte order
-#options		USB_DEBUG
+options 	USB_EHCI_BIG_ENDIAN_DESC	# handle big-endian byte order
+#options 	USB_DEBUG
 device		ehci
 device		umass
 device		scbus		# SCSI bus (required for SCSI)
diff --git a/sys/arm/conf/CRB b/sys/arm/conf/CRB
index 5252132..ef0265f 100644
--- a/sys/arm/conf/CRB
+++ b/sys/arm/conf/CRB
@@ -20,11 +20,11 @@
 ident		CRB
 
 options 	PHYSADDR=0x00000000
-options		KERNPHYSADDR=0x00200000	
-options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+options 	KERNPHYSADDR=0x00200000	
+options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 
-options COUNTS_PER_SEC=400000000
-options STARTUP_PAGETABLE_ADDR=0x00000000
+options 	COUNTS_PER_SEC=400000000
+options 	STARTUP_PAGETABLE_ADDR=0x00000000
 include		"../xscale/i8134x/std.crb"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
@@ -32,9 +32,9 @@ makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
-options		HZ=100
-options		BREAK_TO_DEBUGGER
-#options		DEVICE_POLLING
+options 	HZ=100
+options 	BREAK_TO_DEBUGGER
+#options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -53,18 +53,18 @@ options 	CD9660			#ISO 9660 Filesystem
 options 	PSEUDOFS		#Pseudo-filesystem framework
 options 	SCSI_DELAY=5000		#Delay (in ms) before probing SCSI
 options 	KTRACE			#ktrace(1) support
-options		INTR_FILTER
+options 	INTR_FILTER
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=em0
-options		BOOTP_COMPAT
-#options		PREEMPTION
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=em0
+options 	BOOTP_COMPAT
+#options 	PREEMPTION
 device		loop
 device		ether
 #device		saarm
@@ -75,12 +75,12 @@ device		uart
 device		pci
 
 device		ata
-device		atadisk         # ATA disk drives
-device		ataraid         # ATA RAID drives
-device		atapicd         # ATAPI CDROM drives
-device		atapifd         # ATAPI floppy drives
-device		atapist         # ATAPI tape drives
-options		ATA_STATIC_ID   # Static device numbering
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+options 	ATA_STATIC_ID	# Static device numbering
 
 device		"7seg"
 
@@ -93,22 +93,22 @@ device		pty
 					# output.  Adds ~215k to driver.
 
 # Debugging for use in -current
-options		KDB
+options 	KDB
 options 	DDB			#Enable the kernel debugger
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		DIAGNOSTIC
+#options 	DIAGNOSTIC
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
-options		XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
-device          random          # Entropy device
+options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
+device		md
+device		random		# Entropy device
 
 device		iopwdog
-options		ARM_USE_SMALL_ALLOC
+options 	ARM_USE_SMALL_ALLOC
 # Floppy drives
 
diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX
index 5d30cd1..7f411a1 100644
--- a/sys/arm/conf/DB-78XXX
+++ b/sys/arm/conf/DB-78XXX
@@ -7,7 +7,7 @@
 ident		DB-88F78XX
 include		"../mv/discovery/std.db78xxx"
 
-options		SOC_MV_DISCOVERY
+options 	SOC_MV_DISCOVERY
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCLIENT		#Network Filesystem Client
-options		NFSLOCKD		#Network Lock Manager
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=mge0
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
 
-#options		ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Debugging
-options		ALT_BREAK_TO_DEBUGGER
-options		DDB
-options		DIAGNOSTIC
+options 	ALT_BREAK_TO_DEBUGGER
+options 	DDB
+options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-options		KDB
+options 	KDB
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		WITNESS_KDB
+#options 	WITNESS_KDB
 
 device		pci
 
diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX
index 3b877cc..5989e3e 100644
--- a/sys/arm/conf/DB-88F5XXX
+++ b/sys/arm/conf/DB-88F5XXX
@@ -7,7 +7,7 @@
 ident		DB-88F5XXX
 include		"../mv/orion/std.db88f5xxx"
 
-options		SOC_MV_ORION
+options 	SOC_MV_ORION
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCLIENT		#Network Filesystem Client
-options		NFSLOCKD		#Network Lock Manager
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=mge0
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
 
-#options		ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Debugging
-options		ALT_BREAK_TO_DEBUGGER
-options		DDB
-options		DIAGNOSTIC
+options 	ALT_BREAK_TO_DEBUGGER
+options 	DDB
+options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-options		KDB
+options 	KDB
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		WITNESS_KDB
+#options 	WITNESS_KDB
 
 device		pci
 
@@ -64,8 +64,8 @@ device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		e1000phy
 device		bpf
-options		DEVICE_POLLING
-options		HZ=1000
+options 	DEVICE_POLLING
+options 	HZ=1000
 
 # I2C (TWSI)
 device		iic
diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 9831b39..c44f801 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -7,7 +7,7 @@
 ident		DB-88F6XXX
 include		"../mv/kirkwood/std.db88f6xxx"
 
-options		SOC_MV_KIRKWOOD
+options 	SOC_MV_KIRKWOOD
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
@@ -18,34 +18,34 @@ options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	NFSCLIENT		#Network Filesystem Client
-options		NFSLOCKD		#Network Lock Manager
+options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=mge0
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
 
-#options		ROOTDEVNAME=\"ufs:/dev/da0a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 options 	SYSVSHM			#SYSV-style shared memory
 options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
 # Debugging
-options		ALT_BREAK_TO_DEBUGGER
-options		DDB
-options		DIAGNOSTIC
+options 	ALT_BREAK_TO_DEBUGGER
+options 	DDB
+options 	DIAGNOSTIC
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
-options		KDB
+options 	KDB
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		WITNESS_KDB
+#options 	WITNESS_KDB
 
 device		pci
 
diff --git a/sys/arm/conf/EP80219 b/sys/arm/conf/EP80219
index 44fe262..65121bc 100644
--- a/sys/arm/conf/EP80219
+++ b/sys/arm/conf/EP80219
@@ -20,11 +20,11 @@
 ident		EP80219
 
 options 	PHYSADDR=0xa0000000
-options	KERNPHYSADDR=0xa0200000	
-options	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+options 	KERNPHYSADDR=0xa0200000	
+options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 
 options 	STARTUP_PAGETABLE_ADDR=0xa0000000
-#options	ARM32_NEW_VM_LAYOUT
+#options 	ARM32_NEW_VM_LAYOUT
 include	"../xscale/i80321/std.ep80219"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
@@ -32,8 +32,8 @@ makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
-options	HZ=100
-#options		DEVICE_POLLING
+options 	HZ=100
+#options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -57,15 +57,15 @@ options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options   	GEOM_PART_GPT    # GUID Partition Tables.
-options   	GEOM_LABEL    # Providers labelization.
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_LABEL		# Providers labelization.
 
-options	BOOTP
-options	BOOTP_NFSROOT
-options	BOOTP_NFSV3
-options	BOOTP_WIRED_TO=fxp0
-options	BOOTP_COMPAT
-#options	PREEMPTION
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=fxp0
+options 	BOOTP_COMPAT
+#options 	PREEMPTION
 device		loop
 device		ether
 #device		saarm
@@ -75,12 +75,12 @@ device		uart
 device		pci
 
 device		ata
-device		atadisk         # ATA disk drives
-device		ataraid         # ATA RAID drives
-device		atapicd         # ATAPI CDROM drives
-device		atapifd         # ATAPI floppy drives
-device		atapist         # ATAPI tape drives
-options	ATA_STATIC_ID   # Static device numbering
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+options 	ATA_STATIC_ID	# Static device numbering
 
 # SCSI Controllers
 
@@ -89,27 +89,27 @@ device		iopwdog			# I80321 Watchdog
 device		dma			# I80321 DMA Controller
 
 # Debugging for use in -current
-options	KDB
+options 	KDB
 options 	DDB			#Enable the kernel debugger
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		DIAGNOSTIC
+#options 	DIAGNOSTIC
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
-options	XSCALE_CACHE_READ_WRITE_ALLOCATE
-device 	md
+options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
+device		md
 device		random          # Entropy device
 
-options	ARM_USE_SMALL_ALLOC
+options 	ARM_USE_SMALL_ALLOC
 # Floppy drives
 
-options	INCLUDE_CONFIG_FILE     # Include this file in kernel
-#options	VERBOSE_SYSINIT
-options	VERBOSE_INIT_ARM
+options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
+#options 	VERBOSE_SYSINIT
+options 	VERBOSE_INIT_ARM
 
-device 	bpf
-#options   ROOTDEVNAME=\"ufs:ad4s1a\"
+device		bpf
+#options 	ROOTDEVNAME=\"ufs:ad4s1a\"
diff --git a/sys/arm/conf/GUMSTIX b/sys/arm/conf/GUMSTIX
index 05172ca..864a4f5 100644
--- a/sys/arm/conf/GUMSTIX
+++ b/sys/arm/conf/GUMSTIX
@@ -27,18 +27,18 @@ cpu		CPU_XSCALE_PXA2X0
 hints		"GUMSTIX.hints"
 
 options 	PHYSADDR=0xa0000000
-options		KERNPHYSADDR=0xa0200000	
-options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+options 	KERNPHYSADDR=0xa0200000	
+options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
 
-options		STARTUP_PAGETABLE_ADDR=0xa0000000
+options 	STARTUP_PAGETABLE_ADDR=0xa0000000
 include		"../xscale/pxa/std.pxa"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options		HZ=100
-#options		DEVICE_POLLING
+options 	HZ=100
+#options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -62,13 +62,13 @@ options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_WIRED_TO=smc0
-options		BOOTP_COMPAT
-options		BOOTP_NFSV3
-options		BOOTP_BLOCKSIZE=4096
-options		PREEMPTION
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_WIRED_TO=smc0
+options 	BOOTP_COMPAT
+options 	BOOTP_NFSV3
+options 	BOOTP_BLOCKSIZE=4096
+options 	PREEMPTION
 device		loop
 device		ether
 device		mii
@@ -80,7 +80,7 @@ device		uart_ns8250
 device		pty
 
 # Debugging for use in -current
-options		KDB
+options 	KDB
 options 	DDB			#Enable the kernel debugger
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
@@ -89,4 +89,4 @@ options 	DDB			#Enable the kernel debugger
 #options 	DIAGNOSTIC
 
 device		md
-device          random          # Entropy device
+device		random		# Entropy device
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index de322ec..61f74cf 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -26,8 +26,8 @@ hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -44,7 +44,7 @@ options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSLOCKD		#Network Lock Manager
 options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 options 	BOOTP_NFSROOT
-options		BOOTP
+options 	BOOTP
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=ate0
 options 	BOOTP_COMPAT
@@ -61,7 +61,7 @@ options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 #options 	SYSCTL_OMIT_DESCR
 options 	MUTEX_NOINLINE
-options		RWLOCK_NOINLINE
+options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 device		random
@@ -94,23 +94,23 @@ device		icee
 
 device		bpf
 # USB support
-device          ohci            # OHCI localbus->USB interface
-device          usb             # USB Bus (required)
-#device         udbp            # USB Double Bulk Pipe devices
-device          uhid            # "Human Interface Devices"
-device          ulpt            # Printer
-device          umass           # Disks/Mass storage - Requires scbus and da
-device          ural            # Ralink Technology RT2500USB wireless NICs
-device          rum             # Ralink Technology RT2501USB wireless NICs
-device          urio            # Diamond Rio 500 MP3 player
+device		ohci		# OHCI localbus->USB interface
+device		usb		# USB Bus (required)
+#device		udbp		# USB Double Bulk Pipe devices
+device		uhid		# "Human Interface Devices"
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ural		# Ralink Technology RT2500USB wireless NICs
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		urio		# Diamond Rio 500 MP3 player
 # USB Ethernet, requires miibus
 device		miibus
-device          aue             # ADMtek USB Ethernet
-device          axe             # ASIX Electronics USB Ethernet
-device          cdce            # Generic USB over Ethernet
-device          cue             # CATC USB Ethernet
-device          kue             # Kawasaki LSI USB Ethernet
-device          rue             # RealTek RTL8150 USB Ethernet
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cdce		# Generic USB over Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
+device		rue		# RealTek RTL8150 USB Ethernet
 device		udav
 # usb serial
 device		uark
@@ -122,13 +122,13 @@ device		uplcom
 device		uvisor
 device		uvscom
 # SCSI peripherals
-device		scbus           # SCSI bus (required for SCSI)
-device		da              # Direct Access (disks)
-device		cd              # CD
-device		pass            # Passthrough device (direct SCSI access)
+device		scbus		# SCSI bus (required for SCSI)
+device		da		# Direct Access (disks)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
 # Wireless NIC cards
-device          wlan            # 802.11 support
-device          wlan_wep        # 802.11 WEP support
-device          wlan_ccmp       # 802.11 CCMP support
-device          wlan_tkip       # 802.11 TKIP support
-device          wlan_amrr       # AMRR transmit rate control algorithm
+device		wlan		# 802.11 support
+device		wlan_wep	# 802.11 WEP support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
+device		wlan_amrr	# AMRR transmit rate control algorithm
diff --git a/sys/arm/conf/IQ31244 b/sys/arm/conf/IQ31244
index d3c225b..e8ed9e8 100644
--- a/sys/arm/conf/IQ31244
+++ b/sys/arm/conf/IQ31244
@@ -20,10 +20,10 @@
 ident		IQ31244
 
 options 	PHYSADDR=0xa0000000
-options		KERNPHYSADDR=0xa0200000	
-options		KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
-options		FLASHADDR=0xf0000000
-options		LOADERRAMADDR=0x00000000
+options 	KERNPHYSADDR=0xa0200000	
+options 	KERNVIRTADDR=0xc0200000		# Used in ldscript.arm
+options 	FLASHADDR=0xf0000000
+options 	LOADERRAMADDR=0x00000000
 
 options STARTUP_PAGETABLE_ADDR=0xa0000000
 include		"../xscale/i80321/std.iq31244"
@@ -33,8 +33,8 @@ makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
-options		HZ=100
-#options		DEVICE_POLLING
+options 	HZ=100
+#options 	DEVICE_POLLING
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -58,12 +58,12 @@ options 	SYSVMSG			#SYSV-style message queues
 options 	SYSVSEM			#SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		BOOTP
-options		BOOTP_NFSROOT
-options		BOOTP_NFSV3
-options		BOOTP_WIRED_TO=em0
-options		BOOTP_COMPAT
-#options		PREEMPTION
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=em0
+options 	BOOTP_COMPAT
+#options 	PREEMPTION
 device		loop
 device		ether
 #device		saarm
@@ -74,12 +74,12 @@ device		uart
 device		pci
 
 device		ata
-device		atadisk         # ATA disk drives
-device		ataraid         # ATA RAID drives
-device		atapicd         # ATAPI CDROM drives
-device		atapifd         # ATAPI floppy drives
-device		atapist         # ATAPI tape drives
-options		ATA_STATIC_ID   # Static device numbering
+device		atadisk		# ATA disk drives
+device		ataraid		# ATA RAID drives
+device		atapicd		# ATAPI CDROM drives
+device		atapifd		# ATAPI floppy drives
+device		atapist		# ATAPI tape drives
+options 	ATA_STATIC_ID	# Static device numbering
 
 # SCSI Controllers
 
@@ -94,21 +94,21 @@ device		"iq31244_7seg"		# IQ31244 7 seg
 					# output.  Adds ~215k to driver.
 
 # Debugging for use in -current
-options		KDB
+options 	KDB
 options 	DDB			#Enable the kernel debugger
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
-#options		DIAGNOSTIC
+#options 	DIAGNOSTIC
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
-options		XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
-device          random          # Entropy device
+options 	XSCALE_CACHE_READ_WRITE_ALLOCATE
+device		md
+device		random		# Entropy device
 
-options		ARM_USE_SMALL_ALLOC
+options 	ARM_USE_SMALL_ALLOC
 # Floppy drives
 
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 1f688f8..31f0096 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -95,40 +95,40 @@ device		icee
 
 device		bpf
 # USB support
-device          ohci            # OHCI localbus->USB interface
-device          usb             # USB Bus (required)
-#device         udbp            # USB Double Bulk Pipe devices
-device          uhid            # "Human Interface Devices"
-device          ulpt            # Printer
-device          umass           # Disks/Mass storage - Requires scbus and da
-device          ural            # Ralink Technology RT2500USB wireless NICs
-device          rum             # Ralink Technology RT2501USB wireless NICs
-device          urio            # Diamond Rio 500 MP3 player
+device		ohci		# OHCI localbus->USB interface
+device		usb		# USB Bus (required)
+#device		udbp		# USB Double Bulk Pipe devices
+device		uhid		# "Human Interface Devices"
+device		ulpt		# Printer
+device		umass		# Disks/Mass storage - Requires scbus and da
+device		ural		# Ralink Technology RT2500USB wireless NICs
+device		rum		# Ralink Technology RT2501USB wireless NICs
+device		urio		# Diamond Rio 500 MP3 player
 # USB Ethernet, requires miibus
 device		miibus
-device          aue             # ADMtek USB Ethernet
-device          axe             # ASIX Electronics USB Ethernet
-device          cdce            # Generic USB over Ethernet
-device          cue             # CATC USB Ethernet
-device          kue             # Kawasaki LSI USB Ethernet
-device          rue             # RealTek RTL8150 USB Ethernet
+device		aue		# ADMtek USB Ethernet
+device		axe		# ASIX Electronics USB Ethernet
+device		cdce		# Generic USB over Ethernet
+device		cue		# CATC USB Ethernet
+device		kue		# Kawasaki LSI USB Ethernet
+device		rue		# RealTek RTL8150 USB Ethernet
 device		udav
 # usb serial
-device          uark
-device          ubsa
-device          uftdi
-device          uipaq
-device          uplcom
-device          uvisor
-device          uvscom
+device		uark
+device		ubsa
+device		uftdi
+device		uipaq
+device		uplcom
+device		uvisor
+device		uvscom
 # SCSI peripherals
-device          scbus           # SCSI bus (required for SCSI)
-device          da              # Direct Access (disks)
-device          cd              # CD
-device          pass            # Passthrough device (direct SCSI access)
+device		scbus		# SCSI bus (required for SCSI)
+device		da		# Direct Access (disks)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
 # Wireless NIC cards
-device          wlan            # 802.11 support
-device          wlan_wep        # 802.11 WEP support
-device          wlan_ccmp       # 802.11 CCMP support
-device          wlan_tkip       # 802.11 TKIP support
-device          wlan_amrr       # AMRR transmit rate control algorithm
+device		wlan		# 802.11 support
+device		wlan_wep	# 802.11 WEP support
+device		wlan_ccmp	# 802.11 CCMP support
+device		wlan_tkip	# 802.11 TKIP support
+device		wlan_amrr	# AMRR transmit rate control algorithm
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index 614a8a0..f14a779 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -104,7 +104,7 @@ device		pty
 device		loop
 
 device		md
-device          random          # Entropy device
+device		random		# Entropy device
 
 #options 	ARM_USE_SMALL_ALLOC
 
diff --git a/sys/arm/conf/SIMICS b/sys/arm/conf/SIMICS
index ef1ccb0..e225795 100644
--- a/sys/arm/conf/SIMICS
+++ b/sys/arm/conf/SIMICS
@@ -29,8 +29,8 @@ makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=strongarm
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 
 options 	SCHED_4BSD		#4BSD scheduler
 options 	INET			#InterNETworking
@@ -40,7 +40,7 @@ options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
-options		ROOTDEVNAME=\"ufs:md0\"
+options 	ROOTDEVNAME=\"ufs:md0\"
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
@@ -68,4 +68,4 @@ device		uart
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
-device md
+device		md
diff --git a/sys/arm/conf/SKYEYE b/sys/arm/conf/SKYEYE
index 007d49e..56fa39c 100644
--- a/sys/arm/conf/SKYEYE
+++ b/sys/arm/conf/SKYEYE
@@ -20,9 +20,9 @@
 
 ident		KB920X
 
-options		KERNPHYSADDR=0xc0000000	
-options		KERNVIRTADDR=0xc0000000	
-options		PHYSADDR=0xc0000000
+options 	KERNPHYSADDR=0xc0000000	
+options 	KERNVIRTADDR=0xc0000000	
+options 	PHYSADDR=0xc0000000
 include		"../at91/std.kb920x"
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
@@ -30,8 +30,8 @@ makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=arm9
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 
 
 options 	SCHED_4BSD		#4BSD scheduler
@@ -42,8 +42,8 @@ options 	SOFTUPDATES		#Enable FFS soft updates support
 options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
-options		MD_ROOT_SIZE=4096
-options		ROOTDEVNAME=\"ufs:md0\"
+options 	MD_ROOT_SIZE=4096
+options 	ROOTDEVNAME=\"ufs:md0\"
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
 options 	NFSLOCKD		#Network Lock Manager
@@ -79,8 +79,8 @@ device		uart
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
 
-device md
-options		SKYEYE_WORKAROUNDS
+device		md
+options 	SKYEYE_WORKAROUNDS
 # Floppy drives