On Sat, 2009-04-04 at 01:09 +0200, Wolfgang Denk wrote:
> Dear Peter Tyser,
>
> In message <1236988492-21295-7-git-send-email-pty...@xes-inc.com> you wrote:
> > Some systems have bzlib.h installed in /usr/include/. This isn't the
> > desired file (we want the one in include/bzlib.h). Moving U-Boot's
> > bzlib.h to include/u-boot/ avoids this conflict.
> >
> > Signed-off-by: Peter Tyser <pty...@xes-inc.com>
> > ---
> > board/mpl/common/common_util.c | 2 +-
> > common/cmd_bootm.c | 2 +-
> > include/{ => u-boot}/bzlib.h | 0
> > lib_generic/bzlib_private.h | 2 +-
> > lib_m68k/bootm.c | 2 +-
> > lib_ppc/bootm.c | 2 +-
> > 6 files changed, 5 insertions(+), 5 deletions(-)
> > rename include/{ => u-boot}/bzlib.h (100%)
>
> Patch fails to apply. Please rebase and resubmit.
This should patch should apply cleanly now. It failed previously
because patch 5/28 failed. Patch 5/28 was resubmitted as "rename
include/zlib.h to include/u-boot/zlib.h" and has been accepted.
Would you like me to resumbit, or will you apply this patch?
Thanks,
Peter
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
