On Sat, 2009-04-04 at 01:08 +0200, Wolfgang Denk wrote:
> Dear Peter Tyser,
>
> In message <1236988492-21295-6-git-send-email-pty...@xes-inc.com> you wrote:
> > Some systems have zlib.h installed in /usr/include/. This isn't the
> > desired file (we want the one in include/zlib.h). Moving U-Boot's
> > zlib.h to include/u-boot/ avoids this conflict.
> >
> > Signed-off-by: Peter Tyser <pty...@xes-inc.com>
> > ---
> > common/cmd_bootm.c | 2 +-
> > fs/cramfs/uncompress.c | 2 +-
> > include/{ => u-boot}/zlib.h | 0
> > lib_arm/bootm.c | 2 +-
> > lib_avr32/bootm.c | 2 +-
> > lib_generic/crc32.c | 2 +-
> > lib_generic/gunzip.c | 2 +-
> > lib_generic/zlib.c | 2 +-
> > lib_i386/bootm.c | 2 +-
> > lib_m68k/bootm.c | 2 +-
> > lib_microblaze/bootm.c | 2 +-
> > lib_mips/bootm.c | 2 +-
> > lib_ppc/bootm.c | 2 +-
> > 13 files changed, 12 insertions(+), 12 deletions(-)
> > rename include/{ => u-boot}/zlib.h (100%)
>
> Patch fails to apply. Please rebase and resubmit.
Sorry for the slow reply, I've been out of the office this past week.
It looks like Jean-Christophe re-submitted this as "PATCH 2/2 V2] rename
include/zlib.h to include/u-boot/zlib.h" which has been accepted so I
won't resumbit.
Jean-Christophe, thanks for rebasing/resending this. In the future it'd
be nice if you kept the original signed-off-by around as your patch is
pretty much just a rebased version of this one.
Best,
Peter
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
