diff options
| author | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
|---|---|---|
| committer | Bartlomiej Sieka <tur@semihalf.com> | 2008-03-26 09:38:06 +0100 |
| commit | 27f33e9f45ef7f9685cbdc65066a1828e85dde4f (patch) | |
| tree | 5828044d71e5caa3bec4d05c6c48793df0cd17a3 /include/libfdt_env.h | |
| parent | 18e69a35efbb078403db0c0063986470dad7d082 (diff) | |
| parent | 388b82fddc7c05596f3f615f190da0448227dc82 (diff) | |
| download | olio-uboot-2014.01-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.tar.xz olio-uboot-2014.01-27f33e9f45ef7f9685cbdc65066a1828e85dde4f.zip | |
Merge branch 'new-image' of git://www.denx.de/git/u-boot-testing
Conflicts:
common/cmd_bootm.c
cpu/mpc8xx/cpu.c
Signed-off-by: Bartlomiej Sieka <tur@semihalf.com>
Diffstat (limited to 'include/libfdt_env.h')
| -rw-r--r-- | include/libfdt_env.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/libfdt_env.h b/include/libfdt_env.h index 78f725830..98c522ae4 100644 --- a/include/libfdt_env.h +++ b/include/libfdt_env.h @@ -24,7 +24,11 @@ #include <stddef.h> #include <linux/types.h> #include <asm/byteorder.h> +#ifdef USE_HOSTCC +#include <string.h> +#else #include <linux/string.h> +#endif /* USE_HOSTCC */ extern struct fdt_header *fdt; /* Pointer to the working fdt */ |