diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 0a7fb7dc9b6..5e728f85e7b 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -3021,3 +3021,38 @@ options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
 options 	VM_KMEM_SIZE
 options 	VM_KMEM_SIZE_MAX
 options 	VM_KMEM_SIZE_SCALE
+
+# Yet more undocumented options for linting.
+options 	AAC_DEBUG
+options 	ACD_DEBUG
+options 	ACPI_MAX_THREADS=1
+#!options 	ACPI_NO_SEMAPHORES
+# Broken:
+##options 	ASR_MEASURE_PERFORMANCE
+options 	AST_DEBUG
+options 	ATAPI_DEBUG
+options 	ATA_DEBUG
+# BKTR_ALLOC_PAGES has no effect except to cause warnings, and
+# BROOKTREE_ALLOC_PAGES hasn't actually been superseded by it, since the
+# driver still mostly spells this option BROOKTREE_ALLOC_PAGES.
+##options 	BKTR_ALLOC_PAGES="(217*4+1)"
+options 	BROOKTREE_ALLOC_PAGES="(217*4+1)"
+# Broken:
+##options 	CAPABILITIES
+options 	COMPAT_SUNOS
+options 	CV_DEBUG
+options 	MAXFILES=999
+# METEOR_TEST_VIDEO has no effect since meteor is broken.
+options 	METEOR_TEST_VIDEO
+options 	NDEVFSINO=1025
+options 	NDEVFSOVERFLOW=32769
+options 	NETGRAPH_BRIDGE
+options 	NETSMB
+options 	NETSMBCRYPTO
+# PFIL_HOOKS has no effect here since it is a subset of IPFILTER.
+options 	PFIL_HOOKS
+# SIMOS is broken since it is alpha-only but not ifdefed.
+##options 	SIMOS
+options 	SMBFS
+options 	VESA_DEBUG
+options 	VGA_DEBUG
diff --git a/sys/dev/ata/atapi-all.c b/sys/dev/ata/atapi-all.c
index c0856d44edc..73c520f296b 100644
--- a/sys/dev/ata/atapi-all.c
+++ b/sys/dev/ata/atapi-all.c
@@ -587,7 +587,7 @@ static void
 atapi_finish(struct atapi_request *request)
 {
 #ifdef ATAPI_DEBUG
-    ata_prtdev(atadev->device->device, "finished %s%s\n",
+    ata_prtdev(request->device, "finished %s%s\n",
 	       request->callback ? "callback " : "",
 	       atapi_cmd2str(request->ccb[0]));
 #endif
diff --git a/sys/dev/ata/atapi-cd.c b/sys/dev/ata/atapi-cd.c
index 440c24dfaee..d7bc3e3a4b8 100644
--- a/sys/dev/ata/atapi-cd.c
+++ b/sys/dev/ata/atapi-cd.c
@@ -28,6 +28,8 @@
  * $FreeBSD$
  */
 
+#include "opt_ata.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ata.h>
diff --git a/sys/dev/ata/atapi-tape.c b/sys/dev/ata/atapi-tape.c
index 5500a3511cb..00af24a6c4a 100644
--- a/sys/dev/ata/atapi-tape.c
+++ b/sys/dev/ata/atapi-tape.c
@@ -28,6 +28,8 @@
  * $FreeBSD$
  */
 
+#include "opt_ata.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ata.h>
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 0a7fb7dc9b6..5e728f85e7b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -3021,3 +3021,38 @@ options 	VFS_BIO_DEBUG	# VFS buffer I/O debugging
 options 	VM_KMEM_SIZE
 options 	VM_KMEM_SIZE_MAX
 options 	VM_KMEM_SIZE_SCALE
+
+# Yet more undocumented options for linting.
+options 	AAC_DEBUG
+options 	ACD_DEBUG
+options 	ACPI_MAX_THREADS=1
+#!options 	ACPI_NO_SEMAPHORES
+# Broken:
+##options 	ASR_MEASURE_PERFORMANCE
+options 	AST_DEBUG
+options 	ATAPI_DEBUG
+options 	ATA_DEBUG
+# BKTR_ALLOC_PAGES has no effect except to cause warnings, and
+# BROOKTREE_ALLOC_PAGES hasn't actually been superseded by it, since the
+# driver still mostly spells this option BROOKTREE_ALLOC_PAGES.
+##options 	BKTR_ALLOC_PAGES="(217*4+1)"
+options 	BROOKTREE_ALLOC_PAGES="(217*4+1)"
+# Broken:
+##options 	CAPABILITIES
+options 	COMPAT_SUNOS
+options 	CV_DEBUG
+options 	MAXFILES=999
+# METEOR_TEST_VIDEO has no effect since meteor is broken.
+options 	METEOR_TEST_VIDEO
+options 	NDEVFSINO=1025
+options 	NDEVFSOVERFLOW=32769
+options 	NETGRAPH_BRIDGE
+options 	NETSMB
+options 	NETSMBCRYPTO
+# PFIL_HOOKS has no effect here since it is a subset of IPFILTER.
+options 	PFIL_HOOKS
+# SIMOS is broken since it is alpha-only but not ifdefed.
+##options 	SIMOS
+options 	SMBFS
+options 	VESA_DEBUG
+options 	VGA_DEBUG