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

b8715d8d · Tom Rini · e57d9d15 · f39612d3 · b8715d8d
隐藏空白更改
内联并排

Showing with 0 addition and 2 deletion

common/main.c common/main.c +0 -2

未找到文件。
--- a/common/main.c
+++ b/common/main.c
@@ -53,9 +53,7 @@
 #include <linux/ctype.h>
 #include <menu.h>

-#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
 DECLARE_GLOBAL_DATA_PTR;
-#endif

 /*
 * Board-specific Platform code can reimplement show_boot_progress () if needed