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/quipos | |
| parent | d09ec7f81650425140776995fc9752189ddf7956 (diff) | |
| parent | b3125088a3cc362a21aa3bbd0c0e4e74d74a6f2b (diff) | |
| download | u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.gz u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.tar.bz2 u-boot-4125bbcef6a998ce8580a1f5c53c8c93a56a125b.zip | |
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/quipos')
| -rw-r--r-- | board/quipos/cairo/cairo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/quipos/cairo/cairo.c b/board/quipos/cairo/cairo.c index 5e2f486f8e..6cf54095f5 100644 --- a/board/quipos/cairo/cairo.c +++ b/board/quipos/cairo/cairo.c @@ -50,7 +50,7 @@ void set_muxconf_regs(void) MUX_CAIRO(); } -#if defined(CONFIG_GENERIC_MMC) +#if defined(CONFIG_MMC) int board_mmc_init(bd_t *bis) { return omap_mmc_init(0, 0, 0, -1, -1); |