Index: sys/amd64/conf/MMCCAM
===================================================================
--- sys/amd64/conf/MMCCAM
+++ sys/amd64/conf/MMCCAM
@@ -28,9 +28,9 @@
 device		pass
 device		scbus
 device		da
-device		mmccam
 
-options	MMCCAM
+options		MMCCAM
+
 # Add CAMDEBUG stuff
-options CAMDEBUG
-options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
+options	       CAMDEBUG
+options	       CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
Index: sys/arm/conf/BEAGLEBONE-MMCCAM
===================================================================
--- sys/arm/conf/BEAGLEBONE-MMCCAM
+++ sys/arm/conf/BEAGLEBONE-MMCCAM
@@ -6,16 +6,18 @@
 #
 # $FreeBSD$
 
+#NO_UNIVERSE
+
 include		BEAGLEBONE
 
+options		MMCCAM
+
 # Add CAMDEBUG stuff
 options 	CAMDEBUG
-options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH|CAM_DEBUG_TRACE)
+options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
 
 # pass(4) device
 device		pass
-device		mmccam
-options		MMCCAM
 
 nodevice	mmc
 nodevice	mmcsd
Index: sys/arm/conf/IMX6-MMCCAM
===================================================================
--- /dev/null
+++ sys/arm/conf/IMX6-MMCCAM
@@ -0,0 +1,23 @@
+#
+# IMX6-MMCCAM
+#
+# Custom kernel for IMX6 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.
+#
+# $FreeBSD$
+
+#NO_UNIVERSE
+
+include		IMX6
+
+options		MMCCAM
+
+# Add CAMDEBUG stuff
+options 	CAMDEBUG
+options 	CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH)
+
+# pass(4) device
+device		pass
+
+nodevice	mmc
+nodevice	mmcsd