[U-Boot] [PATCH] move prototype for gunzip() to common.h

[Wolfgang Denk]

Dear Wolfgang Wegner,

In message <1260292862-30403-1-git-send-email-w.wegner at astro-kom.de> you wrote:
> Prototype for gunzip was only in lib_generic/gunzip.c and thus repeated
> in every file using it. This patch moves the prototype to common.h and
> removes all prototypes distributed anywhere else.
> 
> Singed-off-by: Wolfgang Wegner <w.wegner at astro-kom.de>
> ---
>  board/bf527-ezkit/video.c                  |    2 --
>  board/bf533-stamp/video.c                  |    2 --
>  board/bf548-ezkit/video.c                  |    2 --
>  board/cm-bf548/video.c                     |    2 --
>  board/dave/PPChameleonEVB/PPChameleonEVB.c |    3 ---
>  board/esd/apc405/apc405.c                  |    3 ---
>  board/esd/ash405/ash405.c                  |    4 ----
>  board/esd/cpci405/cpci405.c                |    1 -
>  board/esd/hh405/hh405.c                    |    4 ----
>  board/esd/pci405/pci405.c                  |    1 -
>  board/esd/plu405/plu405.c                  |    3 ---
>  board/esd/tasreg/tasreg.c                  |    1 -
>  board/esd/voh405/voh405.c                  |    4 ----
>  board/esd/wuh405/wuh405.c                  |    4 ----
>  board/mpl/common/common_util.c             |    1 -
>  board/prodrive/pdnb3/pdnb3.c               |    1 -
>  common/cmd_bmp.c                           |    2 --
>  common/cmd_bootm.c                         |    1 -
>  common/cmd_license.c                       |    1 -
>  common/cmd_mem.c                           |    2 --
>  drivers/video/cfb_console.c                |    2 --
>  include/common.h                           |    3 +++
>  lib_generic/gunzip.c                       |    1 -
>  23 files changed, 3 insertions(+), 47 deletions(-)

Hm, this doesn't apply any more:

Applying: move prototype for gunzip() to common.h
error: patch failed: board/esd/plu405/plu405.c:90
error: board/esd/plu405/plu405.c: patch does not apply
error: patch failed: include/common.h:608
error: include/common.h: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging board/esd/plu405/plu405.c
CONFLICT (content): Merge conflict in board/esd/plu405/plu405.c
Auto-merging common/cmd_bootm.c
Auto-merging drivers/video/cfb_console.c
Auto-merging include/common.h
CONFLICT (content): Merge conflict in include/common.h
Failed to merge in the changes.
Patch failed at 0001 move prototype for gunzip() to common.h


Please rebase against the "next" branch and resubmit.  Thanks in advance.

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
The optimum committee has no members.
                                                   - Norman Augustine