summaryrefslogtreecommitdiff
path: root/lib_generic/zlib.c
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
commit206c00f26f56af02686cb69bfe5c75e979063171 (patch)
tree4e637df34f87762a2e70649e88f52ac973df1f00 /lib_generic/zlib.c
parent39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff)
parentf8450829f921cf10667af98a8d08edfa3d998f04 (diff)
downloadu-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.zip
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.bz2
Merge branch 'master' into next
Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_generic/zlib.c')
-rw-r--r--lib_generic/zlib.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 5721968..26e5af1 100644
--- a/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@ -30,6 +30,8 @@
#include <compiler.h>
#include <asm/unaligned.h>
#include "u-boot/zlib.h"
+#undef OFF /* avoid conflicts */
+
/* To avoid a build time warning */
#ifdef STDC
#include <malloc.h>