summaryrefslogtreecommitdiff
path: root/lib/libfdt/fdt_rw.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-07-30 03:59:03 -0600
committerTom Rini <trini@ti.com>2014-08-09 11:17:04 -0400
commit0596d35d80f5090440bd9a2a2beaacb268ff59c0 (patch)
treeae3d87ad5ca521d3f9f2f714fb9c0afe68e4c905 /lib/libfdt/fdt_rw.c
parent5bf58ccc8ebd5270f64a20c4c54c98a96acbd7ed (diff)
downloadu-boot-imx-0596d35d80f5090440bd9a2a2beaacb268ff59c0.zip
u-boot-imx-0596d35d80f5090440bd9a2a2beaacb268ff59c0.tar.gz
u-boot-imx-0596d35d80f5090440bd9a2a2beaacb268ff59c0.tar.bz2
fdt: Sync up with libfdt
This brings in changes up to commit f9e91a48 in the libfdt repo. Mostly this is whitespace/minor changes. But there are a few new features: - fdt_size_cells() and fdt_address_cells() - fdt_resize() Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/libfdt/fdt_rw.c')
-rw-r--r--lib/libfdt/fdt_rw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c
index 6fa4f13..bec8b8a 100644
--- a/lib/libfdt/fdt_rw.c
+++ b/lib/libfdt/fdt_rw.c
@@ -43,9 +43,9 @@ static int _fdt_rw_check_header(void *fdt)
#define FDT_RW_CHECK_HEADER(fdt) \
{ \
- int err; \
- if ((err = _fdt_rw_check_header(fdt)) != 0) \
- return err; \
+ int __err; \
+ if ((__err = _fdt_rw_check_header(fdt)) != 0) \
+ return __err; \
}
static inline int _fdt_data_size(void *fdt)