diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM
index 26e19887c800..65bada999030 100644
--- a/sys/amd64/conf/GENERIC-MMCCAM
+++ b/sys/amd64/conf/GENERIC-MMCCAM
@@ -1,23 +1,19 @@
 #
 # GENERIC-MMCCAM
 #
 # Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack.
 #
 
 #NO_UNIVERSE
 
 include		GENERIC
 
 ident		GENERIC-MMCCAM
 
 options 	MMCCAM
 
-# Add CAMDEBUG stuff
+# Allow for CAM debugging
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 
 nodevice	mmc
 nodevice	mmcsd
diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM
index 26e19887c800..65bada999030 100644
--- a/sys/arm/conf/GENERIC-MMCCAM
+++ b/sys/arm/conf/GENERIC-MMCCAM
@@ -1,23 +1,19 @@
 #
 # GENERIC-MMCCAM
 #
 # Custom kernel for GENERIC plus MMCCAM as opposed to the prior MMC stack.
 #
 
 #NO_UNIVERSE
 
 include		GENERIC
 
 ident		GENERIC-MMCCAM
 
 options 	MMCCAM
 
-# Add CAMDEBUG stuff
+# Allow for CAM debugging
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 
 nodevice	mmc
 nodevice	mmcsd
diff --git a/sys/arm64/conf/GENERIC-MMCCAM b/sys/arm64/conf/GENERIC-MMCCAM
index 471b299ab3c2..77d65d959763 100644
--- a/sys/arm64/conf/GENERIC-MMCCAM
+++ b/sys/arm64/conf/GENERIC-MMCCAM
@@ -1,22 +1,19 @@
 #
 # GENERIC-MMCCAM
 #
 # Custom kernel for arm64 plus MMCCAM as opposed to the prior MMC stack. It is
 # present to keep it building in tree since it wouldn't work in LINT.
 #
 
 #NO_UNIVERSE
 
 include		GENERIC
 ident		GENERIC-MMCCAM
 
-# Add CAMDEBUG stuff
-options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
-
-# pass(4) device
-device		pass
 options 	MMCCAM
 
+# Allow for CAM debugging
+options 	CAMDEBUG
+
 nodevice	mmc
 nodevice	mmcsd