From: Simon Glass <sjg@chromium.org>
Date: Wed, 15 May 2013 06:23:59 +0000 (+0000)
Subject: main: Correct header order
X-Git-Tag: v2013.07-rc1~42
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fbcdf32af74102276a154895f325d2cd92d1a3e9;p=oweals%2Fu-boot.git

main: Correct header order

The headers are a bit out of order, so fix them.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/common/main.c b/common/main.c
index 1adfea69a1..e5173d7284 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;