From a31e091ad70915278fb15b79d6ae53ea2d44b251 Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Sat, 4 Apr 2009 12:49:11 +0200
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib_avr32')

diff --git a/lib_avr32/bootm.c b/lib_avr32/bootm.c
index 0ca4718c88..6a3172a9a0 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>
-- 
cgit