diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-15 20:17:56 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-16 08:10:50 -0400 |
commit | 4125bbcef6a998ce8580a1f5c53c8c93a56a125b (patch) | |
tree | 291b37802625be36bced91db4f86b158e41c2e13 /board/compulab/cl-som-am57x/cl-som-am57x.c | |
parent | d09ec7f81650425140776995fc9752189ddf7956 (diff) | |
parent | b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff) | |
download | u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.gz |
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 <trini@konsulko.com>
Diffstat (limited to 'board/compulab/cl-som-am57x/cl-som-am57x.c')
-rw-r--r-- | board/compulab/cl-som-am57x/cl-som-am57x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/compulab/cl-som-am57x/cl-som-am57x.c b/board/compulab/cl-som-am57x/cl-som-am57x.c index 4701b71102..389eebb589 100644 --- a/board/compulab/cl-som-am57x/cl-som-am57x.c +++ b/board/compulab/cl-som-am57x/cl-som-am57x.c @@ -33,7 +33,7 @@ int board_init(void) return 0; } -#ifdef CONFIG_GENERIC_MMC +#ifdef CONFIG_MMC #define SB_SOM_CD_GPIO 187 #define SB_SOM_WP_GPIO 188 @@ -51,7 +51,7 @@ int board_mmc_init(bd_t *bis) return ret0 && ret1; } -#endif /* CONFIG_GENERIC_MMC */ +#endif /* CONFIG_MMC */ int misc_init_r(void) { |