[U-Boot] [PATCH/next v3 06/28] Rename include/bzlib.h to include/u-boot/bzlib.h

[Wolfgang Denk]

Dear Peter Tyser,

In message <1236988492-21295-7-git-send-email-ptyser at 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 <ptyser at 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.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
But it's real. And if it's real it can be affected ... we may not  be
able  to break it, but, I'll bet you credits to Navy Beans we can put
a dent in it.
	-- deSalle, "Catspaw", stardate 3018.2