aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBartlomiej Sieka2008-03-27 15:06:40 +0100
committerWolfgang Denk2008-03-27 23:49:12 +0100
commit74d1e66d22dac91388bc538b2fe19f735edc5b82 (patch)
tree96d1ce693dc72c2fbc63da37928afd4761e82fd2
parent87c8431fe24d48121f053fe67cff4ccfe097d4d1 (diff)
Fix host tool build breakage, take two
Revert commit 87c8431f and fix build breakage so that the build continues to work on FC systems. Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
-rw-r--r--include/fdt.h4
-rw-r--r--include/libfdt_env.h7
2 files changed, 4 insertions, 7 deletions
diff --git a/include/fdt.h b/include/fdt.h
index 39beada6301..48ccfd91000 100644
--- a/include/fdt.h
+++ b/include/fdt.h
@@ -3,10 +3,6 @@
#ifndef __ASSEMBLY__
-#ifdef USE_HOSTCC
-#include <stdint.h>
-#endif
-
struct fdt_header {
uint32_t magic; /* magic word FDT_MAGIC */
uint32_t totalsize; /* total size of DT block */
diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 98c522ae42a..ab5c3012dbd 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -21,15 +21,16 @@
#ifndef _LIBFDT_ENV_H
#define _LIBFDT_ENV_H
-#include <stddef.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
#ifdef USE_HOSTCC
+#include <stdint.h>
#include <string.h>
#else
#include <linux/string.h>
+#include <linux/types.h>
#endif /* USE_HOSTCC */
+#include <stddef.h>
+#include <asm/byteorder.h>
extern struct fdt_header *fdt; /* Pointer to the working fdt */
#define fdt32_to_cpu(x) __be32_to_cpu(x)