From: Wolfgang Denk <wd@denx.de>
Date: Mon, 7 Dec 2009 21:47:17 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2010.03-rc1~200^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=206c00f26f56af02686cb69bfe5c75e979063171;p=u-boot

Merge branch 'master' into next

Conflicts:
	lib_generic/zlib.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
---

206c00f26f56af02686cb69bfe5c75e979063171
diff --cc lib_generic/zlib.c
index 572196865a,ef1fa22806..26e5af1d8e
--- a/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@@ -26,10 -26,10 +26,12 @@@
  #define ZUTIL_H
  #define ZLIB_INTERNAL
  
 -#include "u-boot/zlib.h"
  #include <common.h>
 +#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>