aboutsummaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2009-04-04 12:49:11 +0200
committerWolfgang Denk <wd@denx.de>2009-04-04 15:37:54 +0200
commita31e091ad70915278fb15b79d6ae53ea2d44b251 (patch)
tree9019ccfe469f9f9e9b7eb4e0ec76031322bb00d5 /common/cmd_bootm.c
parentae644c178f097874a92a6d934f364985fc7e075a (diff)
downloadu-boot-linaro-natty-a31e091ad70915278fb15b79d6ae53ea2d44b251.tar.gz
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 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 6fdeef49a..bd1813ad4 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -30,7 +30,7 @@
#include <command.h>
#include <image.h>
#include <malloc.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
#include <bzlib.h>
#include <environment.h>
#include <lmb.h>