Date: Thu, 8 Mar 2018 22:49:36 +0000 (UTC) From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r330673 - in head/sys: arm/nvidia dev/sdhci Message-ID: <201803082249.w28Mnapr038723@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: manu Date: Thu Mar 8 22:49:36 2018 New Revision: 330673 URL: https://svnweb.freebsd.org/changeset/base/330673 Log: Fix build when option MMCCAM is defined. Modified: head/sys/arm/nvidia/tegra_sdhci.c head/sys/dev/sdhci/sdhci_fdt.c Modified: head/sys/arm/nvidia/tegra_sdhci.c ============================================================================== --- head/sys/arm/nvidia/tegra_sdhci.c Thu Mar 8 22:32:18 2018 (r330672) +++ head/sys/arm/nvidia/tegra_sdhci.c Thu Mar 8 22:49:36 2018 (r330673) @@ -62,6 +62,8 @@ __FBSDID("$FreeBSD$"); #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 @@ -463,5 +465,7 @@ static DEFINE_CLASS_0(sdhci, tegra_sdhci_driver, tegra sizeof(struct tegra_sdhci_softc)); DRIVER_MODULE(sdhci_tegra, simplebus, tegra_sdhci_driver, tegra_sdhci_devclass, NULL, NULL); +#ifndef MMCCAM MODULE_DEPEND(sdhci_tegra, sdhci, 1, 1, 1); MMC_DECLARE_BRIDGE(sdhci); +#endif Modified: head/sys/dev/sdhci/sdhci_fdt.c ============================================================================== --- head/sys/dev/sdhci/sdhci_fdt.c Thu Mar 8 22:32:18 2018 (r330672) +++ head/sys/dev/sdhci/sdhci_fdt.c Thu Mar 8 22:49:36 2018 (r330673) @@ -59,6 +59,8 @@ __FBSDID("$FreeBSD$"); #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 @@ -351,5 +353,7 @@ static devclass_t sdhci_fdt_devclass; DRIVER_MODULE(sdhci_fdt, simplebus, sdhci_fdt_driver, sdhci_fdt_devclass, NULL, NULL); +#ifndef MMCCAM MODULE_DEPEND(sdhci_fdt, sdhci, 1, 1, 1); MMC_DECLARE_BRIDGE(sdhci_fdt); +#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803082249.w28Mnapr038723>