Commit becfc3c8 authored by Grant Likely's avatar Grant Likely
Browse files

Merge remote-tracking branch 'robh/for-next' into devicetree/next

parents ce32f859 0b34c1a4
Loading
Loading
Loading
Loading
+0 −0

File mode changed from 100755 to 100644.

+1 −0
Original line number Diff line number Diff line
@@ -211,3 +211,4 @@ xillybus Xillybus Ltd.
xlnx	Xilinx
zyxel	ZyXEL Communications Corp.
zarlink	Zarlink Semiconductor
zii	Zodiac Inflight Innovations
+4 −0
Original line number Diff line number Diff line
@@ -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)
Loading