diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2009-04-04 12:49:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 15:37:54 +0200 |
| commit | a31e091ad70915278fb15b79d6ae53ea2d44b251 (patch) | |
| tree | 9019ccfe469f9f9e9b7eb4e0ec76031322bb00d5 /lib_arm/bootm.c | |
| parent | ae644c178f097874a92a6d934f364985fc7e075a (diff) | |
| download | u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.zip u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.gz u-boot-imx-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.bz2 | |
rename include/zlib.h to include/u-boot/zlib.h
Some systems have zlib.h installed in /usr/include/. This isn't the
desired file for u-boot code - we want the one in include/zlib.h.
This rename will avoid the conflict.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'lib_arm/bootm.c')
| -rw-r--r-- | lib_arm/bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c index 7dbde7d..128b7e3 100644 --- a/lib_arm/bootm.c +++ b/lib_arm/bootm.c @@ -24,7 +24,7 @@ #include <common.h> #include <command.h> #include <image.h> -#include <zlib.h> +#include <u-boot/zlib.h> #include <asm/byteorder.h> DECLARE_GLOBAL_DATA_PTR; |