summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-11-29 06:41:56 -0700
committerTom Rini <trini@ti.com>2012-11-29 06:41:56 -0700
commitb8715d8def240014da5614a4f940130ec06d9ebf (patch)
tree8b37067afdf72997ec21b8ebc251c496a47c0e08
parente57d9d15eeab923f6c0de05d7caad317d861bbc5 (diff)
parentf39612d360c02ce97e7ca7a872693f348f7ec8fd (diff)
downloadu-boot-imx-b8715d8def240014da5614a4f940130ec06d9ebf.zip
u-boot-imx-b8715d8def240014da5614a4f940130ec06d9ebf.tar.gz
u-boot-imx-b8715d8def240014da5614a4f940130ec06d9ebf.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-fdt
-rw-r--r--common/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/common/main.c b/common/main.c
index 8052d42..5362781 100644
--- 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