diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index 761728337ac..39ecfb529be 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -439,11 +439,6 @@ device		imcsmb
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-#
-# NVM Express (NVMe) support
-device         nvme    # base NVMe driver
-device         nvd     # expose NVMe namespaces as disks, depends on nvme
-
 #
 # Intel Volume Management Device (VMD) support
 device		vmd
diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES
index 031b5f9567b..c2d718e9f30 100644
--- a/sys/arm64/conf/NOTES
+++ b/sys/arm64/conf/NOTES
@@ -101,11 +101,6 @@ device		ice_ddp		# Intel 800 Series DDP Package
 # Etherswitch devices
 device		e6000sw		# Marvell mv88e6085 based switches
 
-# NVM Express (NVMe) support
-device		nvme		# base NVMe driver
-options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
-device		nvd		# expose NVMe namespaces as disks, depends on nvme
-
 # MMC/SD/SDIO Card slot support
 device		sdhci_xenon		# Marvell Xenon SD/MMC controller
 device		aw_mmc			# Allwinner SD/MMC controller
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3217bdcb960..96e850bd1db 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1672,6 +1672,17 @@ device		mfip		# LSI MegaRAID SAS passthrough, requires CAM
 options 	MFI_DEBUG
 device		mrsas		# LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s
 
+# NVM Express
+#
+# nvme:	PCI-express NVM Express host controllers
+# nda:	CAM NVMe disk driver
+# nvd:	non-CAM NVMe disk driver
+
+device		nvme		# base NVMe driver
+options 	NVME_USE_NVD=1	# Use nvd(4) instead of the CAM nda(4) driver
+device		nda		# NVMe direct access devices (aka disks)
+device		nvd		# expose NVMe namespaces as disks, depends on nvme
+
 #
 # Serial ATA host controllers:
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 45613c10c58..6692a9dba10 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -634,11 +634,6 @@ device		ips
 device		isci
 options 	ISCI_LOGGING	# enable debugging in isci HAL
 
-#
-# NVM Express (NVMe) support
-device         nvme    # base NVMe driver
-device         nvd     # expose NVMe namespaces as disks, depends on nvme
-
 #
 # Intel Volume Management Device (VMD) support
 device		vmd
diff --git a/sys/riscv/conf/NOTES b/sys/riscv/conf/NOTES
index 52720f6d83d..bcf45aa78e9 100644
--- a/sys/riscv/conf/NOTES
+++ b/sys/riscv/conf/NOTES
@@ -40,11 +40,6 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_mmio		# VirtIO MMIO bus
 device		virtio_random		# VirtIO Entropy device
 
-# NVM Express (NVMe) support
-device		nvme		# base NVMe driver
-options 	NVME_USE_NVD=0	# prefer the cam(4) based nda(4) driver
-device		nvd		# expose NVMe namespaces as disks, depends on nvme
-
 # NOTE: dtrace introduces CDDL-licensed components into the kernel
 device		dtrace			# dtrace core
 device		dtraceall		# include all dtrace modules