Give in to the oblique nagging and move AAC and AHC/AHD comments out of

/sys/conf/options and into /sys/conf/NOTES

2 files changed, 34 insertions, 42 deletions

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3189c67..99de13f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1264,16 +1264,29 @@ options 	AHC_DUMP_EEPROM
 # Bitmap of units to enable targetmode operations.
 options 	AHC_TMODE_ENABLE
 
+# Compile in Aic7xxx Debugging code.
+options		AHC_DEBUG
+
+# Aic7xxx driver debugging options. See sys/dev/aic7xxx/aic7xxx.h
+options		AHC_DEBUG_OPTS
+
+# Print register bitfields in debug output.  Adds ~128k to driver.
+# See the ahc(4) manpage
+options		AHC_REG_PRETTY_PRINT
+
 # Compile in aic79xx debugging code.
 options 	AHD_DEBUG
 
-# Aic79xx driver debugging options.
+# Aic79xx driver debugging options.  Adds ~215k to driver.
 # See the ahd(4) manpage
 options 	AHD_DEBUG_OPTS=0xFFFFFFFF
 
 # Print human-readable register definitions when debugging
 options 	AHD_REG_PRETTY_PRINT
 
+# Bitmap of units to enable targetmode operations.
+options		AHD_TMODE_ENABLE
+
 # The adw driver will attempt to use memory mapped I/O for all PCI
 # controllers that have it configured only if this option is set.
 options 	ADW_ALLOW_MEMIO
@@ -2385,8 +2398,15 @@ options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
 
 options 	KSTACK_MAX_PAGES=32 # Maximum pages to give the kernel stack
 
+# Adaptec Array Controller driver options
+options		AAC_DEBUG	# Debugging levels:
+				# 0 - quiet, only emit warnings
+				# 1 - noisy, emit major function
+				#     points and things done
+				# 2 - extremely noisy, emit trace
+				#     items in loops, etc.
+
 # Yet more undocumented options for linting.
-options 	AAC_DEBUG
 # Broken:
 ##options 	ASR_MEASURE_PERFORMANCE
 # BKTR_ALLOC_PAGES has no effect except to cause warnings, and
diff --git a/sys/conf/options b/sys/conf/options
index 8515300..0756ea1 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -30,46 +30,18 @@
 # If filename is missing, the default is
 # opt_<name-of-option-in-lower-case>.h
 
-# Adaptec Array Controller driver options
-AAC_DEBUG		opt_aac.h	# Debugging levels:
-					# 0 - quiet, only emit warnings
-					# 1 - noisy, emit major function
-					#     points and things done
-					# 2 - extremely noisy, emit trace
-					#     items in loops, etc.
-
-# Adaptec aic7xxx SCSI controller options
-AHC_ALLOW_MEMIO		opt_aic7xxx.h	# Allow PCI devices to use memory
-					# mapped I/O
-
-AHC_TMODE_ENABLE	opt_aic7xxx.h	# Bitmap of units to enable
-					# targetmode operations.
-
-AHC_DUMP_EEPROM		opt_aic7xxx.h	# Dump the contents of our
-					# configuration prom.
-
-AHC_DEBUG		opt_aic7xxx.h	# Compile in Aic7xxx Debugging code.
-
-AHC_DEBUG_OPTS		opt_aic7xxx.h	# Aic7xxx driver debugging options.
-					# See sys/dev/aic7xxx/aic7xxx.h
-
-AHC_REG_PRETTY_PRINT    opt_aic7xxx.h	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-
-# Adaptec aic79xx SCSI controller options
-AHD_DEBUG		opt_aic79xx.h	# Compile in Aic79xx Debugging code.
-
-AHD_DEBUG_OPTS		opt_aic79xx.h	# Aic79xx driver debugging options.
-					# See sys/dev/aic7xxx/aic79xx.h   
-
-AHD_TMODE_ENABLE	opt_aic79xx.h	# Bitmap of units to enable
-					# targetmode operations.
-
-AHD_REG_PRETTY_PRINT	opt_aic79xx.h	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
-
-ADW_ALLOW_MEMIO		opt_adw.h	# Allow PCI devices to use memory
-					# mapped I/O
+AAC_DEBUG		opt_aac.h
+AHC_ALLOW_MEMIO		opt_aic7xxx.h
+AHC_TMODE_ENABLE	opt_aic7xxx.h
+AHC_DUMP_EEPROM		opt_aic7xxx.h
+AHC_DEBUG		opt_aic7xxx.h
+AHC_DEBUG_OPTS		opt_aic7xxx.h
+AHC_REG_PRETTY_PRINT    opt_aic7xxx.h
+AHD_DEBUG		opt_aic79xx.h
+AHD_DEBUG_OPTS		opt_aic79xx.h
+AHD_TMODE_ENABLE	opt_aic79xx.h	
+AHD_REG_PRETTY_PRINT	opt_aic79xx.h
+ADW_ALLOW_MEMIO		opt_adw.h
 
 # 3ware 9000 series RAID controller driver options
 TWA_DEBUG		opt_twa.h	# 0-10; 10 prints the most messages.