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

f1cc9776 · Tom Rini · 2a48b3a2 · 9b23bafb · f1cc9776
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/video/cfb_console.c drivers/video/cfb_console.c +1 -1

未找到文件。
--- 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;