From 99f233296df7b9a776ce05d90079b76f861f5764 Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 21 May 2008 03:36:53 +0000
Subject: [PATCH] Use the "options " spelling (vs. "options<TAB>") so that
 commented lines line up nicely.

---
 sys/i386/conf/GENERIC    |  5 ++---
 sys/powerpc/conf/GENERIC |  6 +++---
 sys/sun4v/conf/GENERIC   | 24 ++++++++++++------------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 027b2dc40929..72ffa4e32eb2 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -250,8 +250,8 @@ device		xe		# Xircom pccard Ethernet
 
 # Wireless NIC cards
 device		wlan		# 802.11 support
-options		IEEE80211_DEBUG	# enable debug msgs
-options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
+options 	IEEE80211_DEBUG	# enable debug msgs
+options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
 device		wlan_wep	# 802.11 WEP support
 device		wlan_ccmp	# 802.11 CCMP support
 device		wlan_tkip	# 802.11 TKIP support
@@ -326,4 +326,3 @@ device		fwe		# Ethernet over FireWire (non-standard!)
 device		fwip		# IP over FireWire (RFC 2734,3146)
 device		dcons		# Dumb console driver
 device		dcons_crom	# Configuration ROM for dcons
-
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 00d56ef66f4a..517caae42fa8 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -30,7 +30,7 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 options 	POWERMAC		#NewWorld Apple PowerMacs
 options 	PSIM			#GDB PSIM ppc simulator
 
-options		SCHED_ULE		#ULE scheduler
+options 	SCHED_ULE		#ULE scheduler
 options 	INET			#InterNETworking
 options 	INET6			#IPv6 communications protocols
 options 	SCTP			#Stream Control Transmission Protocol
@@ -95,8 +95,8 @@ device		pass		# Passthrough device (direct SCSI access)
 # syscons is the default console driver, resembling an SCO console
 device		sc
 device		kbdmux
-options		SC_OFWFB	# OFW frame buffer
-options		SC_DFLT_FONT	# compile font in
+options 	SC_OFWFB	# OFW frame buffer
+options 	SC_DFLT_FONT	# compile font in
 makeoptions	SC_DFLT_FONT=cp437
 
 # Serial (COM) ports
diff --git a/sys/sun4v/conf/GENERIC b/sys/sun4v/conf/GENERIC
index 640825451267..6186c0c363c4 100644
--- a/sys/sun4v/conf/GENERIC
+++ b/sys/sun4v/conf/GENERIC
@@ -45,7 +45,7 @@ options 	NFSSERVER		# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
 #options 	MSDOSFS			# MSDOS Filesystem
-options		NULLFS
+options 	NULLFS
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
@@ -68,7 +68,7 @@ options 	AUDIT			# Security event auditing
 
 # Debugging for use in -current
 options 	KDB			# Enable kernel debugger support.
-options		KDB_TRACE
+options 	KDB_TRACE
 options 	DDB			# Support DDB.
 #options 	TRAP_TRACING		# Enable trap tracing.
 #options 	TRAP_TRACE_ENTRIES=256	# Trap trace buffer entries.
@@ -77,8 +77,8 @@ options 	DDB			# Support DDB.
 #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		DEBUG_LOCKS
-#options		DEBUG_VFS_LOCKS
+#options 	DEBUG_LOCKS
+#options 	DEBUG_VFS_LOCKS
 
 # To make an SMP kernel, the next line is needed
 options 	SMP			# Symmetric MultiProcessor Kernel
@@ -207,18 +207,18 @@ device		ums		# Mouse
 #device		sbp		# SCSI over FireWire (Requires scbus and da)
 #device		fwe		# Ethernet over FireWire (non-standard!)
 
-#options		SIMULATOR	# compile for ISA simulator
-#options		KTR
-#options		KTR_MASK=(KTR_TRAP)
-#options			USB_DEBUG
-#options			USBVERBOSE
-#options			DEBUG_LOCKS
-#options			DEBUG_VFS_LOCKS
+#options 	SIMULATOR	# compile for ISA simulator
+#options 	KTR
+#options 	KTR_MASK=(KTR_TRAP)
+#options 		USB_DEBUG
+#options 		USBVERBOSE
+#options 		DEBUG_LOCKS
+#options 		DEBUG_VFS_LOCKS
 
 device		ccd
 
 # sched_lock incurs a rather high overhead at a 1000Hz with 32 cpus
 # on most arches and in most cases 1000Hz pessimizes performance
 # its choice was not adequately researched
-options		HZ=100
+options 	HZ=100