diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 99de13fda7ce..54b2ff2b47d6 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1387,6 +1387,14 @@ device		amr		# AMI MegaRAID
 #
 device		twe		# 3ware ATA RAID
 
+#
+# 3ware 9000 series PATA/SATA RAID controller driver and options.
+# The driver is implemented as a SIM, and so, needs the CAM infrastructure.
+#
+options		TWA_DEBUG		# 0-10; 10 prints the most messages.
+options		TWA_FLASH_FIRMWARE	# firmware image bundled when defined.
+device		twa			# 3ware 9000 series PATA/SATA RAID
+
 #
 # The 'ATA' driver supports all ATA and ATAPI devices, including PC Card
 # devices. You only need one "device ata" for it to find all
diff --git a/sys/conf/options b/sys/conf/options
index 0756ea1e1703..ecd16fb8962d 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -43,9 +43,8 @@ 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.
-TWA_FLASH_FIRMWARE	opt_twa.h	# firmware image bundled when defined.
+TWA_DEBUG		opt_twa.h
+TWA_FLASH_FIRMWARE	opt_twa.h
 
 # Miscellaneous options.
 ADAPTIVE_MUTEXES