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

diff --git a/common/main.c b/common/main.c
index 8052d42..5362781 100644 (file)
--- 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