Merge with git://www.denx.de/git/u-boot.git

[platform/kernel/u-boot.git] / libfdt / fdt_rw.c

diff --git a/libfdt/fdt_rw.c b/libfdt/fdt_rw.c
index b33fbf4..693bfe4 100644 (file)
--- a/libfdt/fdt_rw.c
+++ b/libfdt/fdt_rw.c
@@ -16,6 +16,9 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+#include "config.h"
+#if CONFIG_OF_LIBFDT
+
 #include "libfdt_env.h"
 
 #include <fdt.h>
@@ -27,7 +30,7 @@ static int rw_check_header(void *fdt)
 {
        int err;
 
-       if ((err = _fdt_check_header(fdt)))
+       if ((err = fdt_check_header(fdt)))
                return err;
        if (fdt_version(fdt) < 0x11)
                return -FDT_ERR_BADVERSION;
@@ -291,3 +294,5 @@ int fdt_pack(void *fdt)
        fdt_set_header(fdt, totalsize, _blob_data_size(fdt));
        return 0;
 }
+
+#endif /* CONFIG_OF_LIBFDT */