]> git.sur5r.net Git - u-boot/commitdiff
Merge branch 'master' into next
authorWolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 21:47:17 +0000 (22:47 +0100)
committerWolfgang Denk <wd@denx.de>
Mon, 7 Dec 2009 21:47:17 +0000 (22:47 +0100)
Conflicts:
lib_generic/zlib.c

Signed-off-by: Wolfgang Denk <wd@denx.de>
1  2 
Makefile
common/cmd_bootm.c
cpu/arm920t/s3c24x0/timer.c
lib_generic/zlib.c

diff --cc Makefile
Simple merge
Simple merge
Simple merge
index 572196865a5e32b20474f9487f0da59a57deb41f,ef1fa22806a60bf4fd62adbf9d9f8e04a0987d11..26e5af1d8e84bfa74fee86b90adb5d4cbed4b40b
  #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>