commit d45d5a18b6b36688f2365623f9d550566c664b5b
author Marian Balakowicz <m8@semihalf.com> Tue Jan 08 18:11:43 2008 +0100
committer Wolfgang Denk <wd@denx.de> Thu Feb 07 01:12:55 2008 +0100
tree 1e81ef9d3907ba39bbd074a3b1523448b85b4f5b
parent 5d3cc55ecbae277e08f5ff771da20b1d6a36ec36

[new uImage] Cleanup OF/FDT #if/#elif/#endif use in do_bootm_linux()

Make CONFIG_OF_LIBFDT and CONFIG_OF_FLAT_TREE use more
readable in PPC variant of do_bootm_linux() routine.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

common/cmd_bootm.c

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index e61a304..5f1b6b6 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -40,8 +40,7 @@
 #include <fdt.h>
 #include <libfdt.h>
 #include <fdt_support.h>
-#endif
-#if defined(CONFIG_OF_FLAT_TREE)
+#elif defined(CONFIG_OF_FLAT_TREE)
 #include <ft_build.h>
 #endif