commit a31e091ad70915278fb15b79d6ae53ea2d44b251
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Sat Apr 04 12:49:11 2009 +0200
committer Wolfgang Denk <wd@denx.de> Sat Apr 04 15:37:54 2009 +0200
tree 9019ccfe469f9f9e9b7eb4e0ec76031322bb00d5
parent ae644c178f097874a92a6d934f364985fc7e075a

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>

lib_avr32/bootm.c

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 0ca4718..6a3172a 100644
--- a/lib_avr32/bootm.c
+++ b/lib_avr32/bootm.c
@@ -22,7 +22,7 @@
 #include <common.h>
 #include <command.h>
 #include <image.h>
-#include <zlib.h>
+#include <u-boot/zlib.h>
 #include <asm/byteorder.h>
 #include <asm/arch/addrspace.h>
 #include <asm/io.h>