Index: sys/arm/conf/GENERIC-MMCCAM
===================================================================
--- /dev/null
+++ sys/arm/conf/GENERIC-MMCCAM
@@ -0,0 +1,23 @@
+#
+# GENERIC-MMCCAM
+#
+# Custom GENERIC kernel 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		GENERIC
+
+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
Index: sys/arm/nvidia/tegra_sdhci.c
===================================================================
--- sys/arm/nvidia/tegra_sdhci.c
+++ sys/arm/nvidia/tegra_sdhci.c
@@ -62,6 +62,8 @@
 
 #include "sdhci_if.h"
 
+#include "opt_mmccam.h"
+
 /* Tegra SDHOST controller vendor register definitions */
 #define	SDMMC_VENDOR_CLOCK_CNTRL		0x100
 #define	 VENDOR_CLOCK_CNTRL_CLK_SHIFT			8
@@ -464,4 +466,7 @@
 DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, tegra_sdhci_devclass,
     NULL, NULL);
 MODULE_DEPEND(sdhci_tegra, sdhci, 1, 1, 1);
+
+#ifndef MMCCAM
 MMC_DECLARE_BRIDGE(sdhci);
+#endif
Index: sys/dev/sdhci/sdhci_fdt.c
===================================================================
--- sys/dev/sdhci/sdhci_fdt.c
+++ sys/dev/sdhci/sdhci_fdt.c
@@ -57,6 +57,8 @@
 #include "mmcbr_if.h"
 #include "sdhci_if.h"
 
+#include "opt_mmccam.h"
+
 #define	MAX_SLOTS		6
 #define	SDHCI_FDT_ARMADA38X	1
 #define	SDHCI_FDT_GENERIC	2
@@ -344,4 +346,7 @@
 DRIVER_MODULE(sdhci_fdt, simplebus, sdhci_fdt_driver, sdhci_fdt_devclass,
     NULL, NULL);
 MODULE_DEPEND(sdhci_fdt, sdhci, 1, 1, 1);
+
+#ifndef MMCCAM
 MMC_DECLARE_BRIDGE(sdhci_fdt);
+#endif