| commit | fd757b6eb1049e30242af3e3ced94c828b31d869 | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@ti.com> | Thu Nov 29 06:41:56 2012 -0700 |
| committer | Tom Rini <trini@ti.com> | Thu Nov 29 06:41:56 2012 -0700 |
| tree | 8b37067afdf72997ec21b8ebc251c496a47c0e08 | |
| parent | 6c7785cfea634a8a4e75314e1f10bf17fb88e794 [diff] | |
| parent | f4c5a5f41b1cfb43725d806c4a3e58055d3cb72e [diff] |
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 --- 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