Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / include / libfdt_env.h

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 78f725830da8b1a22b9682355df9ec320617f1b0..bf63583d53a9adcea1d9151698b5a9fc03d4e157 100644 (file)
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -21,16 +21,13 @@
 #ifndef _LIBFDT_ENV_H
 #define _LIBFDT_ENV_H
 
-#include <stddef.h>
-#include <linux/types.h>
-#include <asm/byteorder.h>
-#include <linux/string.h>
+#include "compiler.h"
 
-extern struct fdt_header *fdt;  /* Pointer to the working fdt */
+extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 
-#define fdt32_to_cpu(x)                __be32_to_cpu(x)
-#define cpu_to_fdt32(x)                __cpu_to_be32(x)
-#define fdt64_to_cpu(x)                __be64_to_cpu(x)
-#define cpu_to_fdt64(x)                __cpu_to_be64(x)
+#define fdt32_to_cpu(x)                be32_to_cpu(x)
+#define cpu_to_fdt32(x)                cpu_to_be32(x)
+#define fdt64_to_cpu(x)                be64_to_cpu(x)
+#define cpu_to_fdt64(x)                cpu_to_be64(x)
 
 #endif /* _LIBFDT_ENV_H */