Merge branch 'master' of git://git.denx.de/u-boot-video

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index a4cbc4456491a1afc7cbe1d69d9e226fc62ca75e..3c0696eb118d074403a6d7ea96dcde6bcc4ede63 100644 (file)
--- 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;