From 4760597116e34bd58f670d008ae7323653268fb4 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Wed, 29 Apr 2015 16:00:05 -0500 Subject: scripts/dtc: Update to upstream version 9d3649bd3be245c9 Sync dtc with upstream as of commit 9d3649bd3be2 (Add testcases for fdt_path_offset_namelen()). Signed-off-by: Rob Herring Cc: Grant Likely Cc: devicetree@vger.kernel.org --- scripts/dtc/libfdt/libfdt_internal.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/dtc/libfdt/libfdt_internal.h') diff --git a/scripts/dtc/libfdt/libfdt_internal.h b/scripts/dtc/libfdt/libfdt_internal.h index 381133ba81df..02cfa6fb612d 100644 --- a/scripts/dtc/libfdt/libfdt_internal.h +++ b/scripts/dtc/libfdt/libfdt_internal.h @@ -57,9 +57,9 @@ #define FDT_CHECK_HEADER(fdt) \ { \ - int err; \ - if ((err = fdt_check_header(fdt)) != 0) \ - return err; \ + int __err; \ + if ((__err = fdt_check_header(fdt)) != 0) \ + return __err; \ } int _fdt_check_node_offset(const void *fdt, int offset); -- cgit v1.2.3