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

2012-11-29 06:41:56 -07:00
parent e57d9d15ee f39612d360
commit b8715d8def
1 changed files with 0 additions and 2 deletions
--- 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