diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-08 15:49:50 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-08 15:59:41 -0400 |
commit | f5e73a34eddea4fb7c5e3d984b86f395996a64cd (patch) | |
tree | 1854f2e0d2dae343f85870f2a62ae35bdd335a85 /board/congatec/cgtqmx6eval/cgtqmx6eval.c | |
parent | e5aee22e4be75e75a854ab64503fc80598bc2004 (diff) | |
parent | 5053da2e4aa297d888cdfc7d216d935504a9472a (diff) |
Merge tag 'mmc-6-23' of https://github.com/MrVan/u-boot
- Pull in the series to split fsl_esdhc for i.MX/non-i.MX cleanly
Diffstat (limited to 'board/congatec/cgtqmx6eval/cgtqmx6eval.c')
-rw-r--r-- | board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index 50124f8516..7c767fb8b4 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -21,7 +21,7 @@ #include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <mmc.h> -#include <fsl_esdhc.h> +#include <fsl_esdhc_imx.h> #include <i2c.h> #include <input.h> #include <power/pmic.h> @@ -411,7 +411,7 @@ static void setup_spi(void) } #endif -#ifdef CONFIG_FSL_ESDHC +#ifdef CONFIG_FSL_ESDHC_IMX static struct fsl_esdhc_cfg usdhc_cfg[] = { {USDHC2_BASE_ADDR}, {USDHC3_BASE_ADDR}, |