summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2015-06-30 14:28:52 +0100
committerGrant Likely <grant.likely@linaro.org>2015-06-30 14:28:52 +0100
commitbecfc3c86df963491ff1d5ffc6131a06af6bb851 (patch)
tree4b60fb962445166025724b84ce13e7f1762df8a1 /arch/arm/boot
parentce32f859646bab2ed724393398b90aa50149bb44 (diff)
parent0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff)
downloadlinux-becfc3c86df963491ff1d5ffc6131a06af6bb851.tar.bz2
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/libfdt_env.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/libfdt_env.h b/arch/arm/boot/compressed/libfdt_env.h
index 1f4e71876b00..17ae0f3efac8 100644
--- a/arch/arm/boot/compressed/libfdt_env.h
+++ b/arch/arm/boot/compressed/libfdt_env.h
@@ -5,6 +5,10 @@
#include <linux/string.h>
#include <asm/byteorder.h>
+typedef __be16 fdt16_t;
+typedef __be32 fdt32_t;
+typedef __be64 fdt64_t;
+
#define fdt16_to_cpu(x) be16_to_cpu(x)
#define cpu_to_fdt16(x) cpu_to_be16(x)
#define fdt32_to_cpu(x) be32_to_cpu(x)