diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 14:36:14 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-22 14:36:14 +1000 |
commit | 4e982498dc6b90f10b9966746944582807e57277 (patch) | |
tree | 47eebd278195f15abf3ae444c5376bd9d741e316 /arch/powerpc/boot | |
parent | 6747c0596a5cd94af8036b7950e0ea26da908f2a (diff) | |
parent | 4760597116e34bd58f670d008ae7323653268fb4 (diff) |
Merge remote-tracking branch 'dt-rh/for-next'
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/libfdt_env.h | 4 | ||||
-rw-r--r-- | arch/powerpc/boot/of.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h index 8dcd744e5728..7e3789ea396b 100644 --- a/arch/powerpc/boot/libfdt_env.h +++ b/arch/powerpc/boot/libfdt_env.h @@ -10,6 +10,10 @@ typedef u32 uint32_t; typedef u64 uint64_t; typedef unsigned long uintptr_t; +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) diff --git a/arch/powerpc/boot/of.h b/arch/powerpc/boot/of.h index 5603320dce07..53f8f27f94e4 100644 --- a/arch/powerpc/boot/of.h +++ b/arch/powerpc/boot/of.h @@ -21,7 +21,9 @@ int of_setprop(const void *phandle, const char *name, const void *buf, /* Console functions */ void of_console_init(void); +typedef u16 __be16; typedef u32 __be32; +typedef u64 __be64; #ifdef __LITTLE_ENDIAN__ #define cpu_to_be16(x) swab16(x) |