diff options
| author | Tom Rini <trini@konsulko.com> | 2017-02-09 14:54:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-02-09 14:54:09 -0500 |
| commit | f1cc97764be4383d2aeb56d5ba5415439a1d5c97 (patch) | |
| tree | d6180e4f3d8f91b1c4e2c6b5640be6a1495f67e8 /drivers/video | |
| parent | 2a48b3a2c4ec0f1775deeac5cfe7e61072b6b894 (diff) | |
| parent | 9b23bafb4f628aca7a2852f097a7b7da66cac6d8 (diff) | |
| download | u-boot-imx-f1cc97764be4383d2aeb56d5ba5415439a1d5c97.zip u-boot-imx-f1cc97764be4383d2aeb56d5ba5415439a1d5c97.tar.gz u-boot-imx-f1cc97764be4383d2aeb56d5ba5415439a1d5c97.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/cfb_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index a4cbc44..3c0696e 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1968,7 +1968,7 @@ static void *video_logo(void) static int cfb_fb_is_in_dram(void) { bd_t *bd = gd->bd; -#if defined(CONFIG_ARM) || defined(CONFIG_AVR32) || defined(COFNIG_NDS32) || \ +#if defined(CONFIG_ARM) || defined(CONFIG_AVR32) || defined(CONFIG_NDS32) || \ defined(CONFIG_SANDBOX) || defined(CONFIG_X86) ulong start, end; int i; |