summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2013-05-15 06:23:59 +0000
committerTom Rini <trini@ti.com>2013-06-04 16:06:31 -0400
commitfbcdf32af74102276a154895f325d2cd92d1a3e9 (patch)
tree72dfc63319175d7594f6bf0b8a90cce3f34b6891
parent4933381a5b221d31305aef94bef990b3c6a65454 (diff)
downloadu-boot-imx-fbcdf32af74102276a154895f325d2cd92d1a3e9.zip
u-boot-imx-fbcdf32af74102276a154895f325d2cd92d1a3e9.tar.gz
u-boot-imx-fbcdf32af74102276a154895f325d2cd92d1a3e9.tar.bz2
main: Correct header order
The headers are a bit out of order, so fix them. Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/main.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/common/main.c b/common/main.c
index 1adfea6..e5173d7 100644
--- a/common/main.c
+++ b/common/main.c
@@ -28,26 +28,15 @@
/* #define DEBUG */
#include <common.h>
-#include <watchdog.h>
#include <command.h>
#include <fdtdec.h>
-#include <malloc.h>
-#include <version.h>
-#ifdef CONFIG_MODEM_SUPPORT
-#include <malloc.h> /* for free() prototype */
-#endif
-
-#ifdef CONFIG_SYS_HUSH_PARSER
#include <hush.h>
-#endif
-
-#ifdef CONFIG_OF_CONTROL
-#include <fdtdec.h>
-#endif
-
+#include <malloc.h>
+#include <menu.h>
#include <post.h>
+#include <version.h>
+#include <watchdog.h>
#include <linux/ctype.h>
-#include <menu.h>
DECLARE_GLOBAL_DATA_PTR;