commit 6bb94491e9bb3431e56ae1ff48654bfa0e793d06
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 8625a5c67c4991d774909766b2e5ed4e95d6fa09

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_generic/crc32.c

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index b6a7a91..3927ce1 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -17,7 +17,7 @@
 #if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
 #include <watchdog.h>
 #endif
-#include "zlib.h"
+#include "u-boot/zlib.h"
 
 #define local static
 #define ZEXPORT	/* empty */