[U-Boot] [PATCH] [UPDATE] Merged serial_pl010.c and serial_pl011.c.

[Wolfgang Denk <wd@denx.de>]

Dear Andreas Engel,

In message <1219648296-29567-1-git-send-email-andreas.engel@ericsson.com> you wrote:
> They only differ in the init function.
> This also adds the missing watchdog support for the PL011.
> 
> Signed-off-by: Andreas Engel <andreas.engel@ericsson.com>
> ---
>  drivers/serial/Makefile                           |    3 +-
>  drivers/serial/serial_pl011.c                     |  161 ---------------------
>  drivers/serial/{serial_pl010.c => serial_pl01x.c} |   83 +++++++++--
>  drivers/serial/{serial_pl011.h => serial_pl01x.h} |    0
>  4 files changed, 69 insertions(+), 178 deletions(-)
>  delete mode 100644 drivers/serial/serial_pl011.c
>  rename drivers/serial/{serial_pl010.c => serial_pl01x.c} (66%)
>  rename drivers/serial/{serial_pl011.h => serial_pl01x.h} (100%)

This patch does not apply (any more?) :

Applying Merged serial_pl010.c and serial_pl011.c.
error: patch failed: drivers/serial/Makefile:32
error: drivers/serial/Makefile: patch does not apply
fatal: mode change for drivers/serial/serial_pl011.h, which is not in
current HEAD
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

Please rebase 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 use of anthropomorphic terminology when  dealing  with  computing
systems is a symptom of professional immaturity.   -- Edsger Dijkstra