From: Tom Rini Date: Tue, 16 May 2017 00:17:56 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-mmc X-Git-Tag: v2017.07-rc1~256 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4125bbcef6a998ce8580a1f5c53c8c93a56a125b;p=u-boot Merge branch 'master' of git://git.denx.de/u-boot-mmc - Add #undef CONFIG_DM_MMC_OPS to omap3_logic in the SPL build case, to match other TI platforms in the same situation. Signed-off-by: Tom Rini --- 4125bbcef6a998ce8580a1f5c53c8c93a56a125b diff --cc include/configs/omap3_logic.h index 735c9ef08a,772fc60c9c..f8978037f2 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@@ -23,6 -23,6 +23,7 @@@ * DM support in SPL */ #undef CONFIG_DM_MMC ++#undef CONFIG_DM_MMC_OPS #undef OMAP_HSMMC_USE_GPIO /* select serial console configuration for SPL */