[U-Boot] [PATCH 04/11] serial: Clean drivers/serial/Makefile

Wolfgang Denk
2008-08-18T21:28:23Z

Dear monstr at seznam.cz,

In message <1216057545-18698-4-git-send-email-monstr@seznam.cz> you wrote:
> From: Michal Simek <monstr@monstr.eu>
>
>
> Signed-off-by: Michal Simek <monstr@monstr.eu>
> ---
> drivers/serial/Makefile | 24 ++++++++++++------------
> drivers/serial/atmel_usart.c | 3 ---
> drivers/serial/mcfuart.c | 3 ---
> drivers/serial/ns16550.c | 4 ----
> drivers/serial/ns9750_serial.c | 4 ----
> drivers/serial/s3c4510b_uart.c | 4 ----
> drivers/serial/serial.c | 4 ----
> drivers/serial/serial_max3100.c | 4 ----
> drivers/serial/serial_pl010.c | 4 ----
> drivers/serial/serial_pl011.c | 4 ----
> drivers/serial/serial_sh.c | 4 ----
> drivers/serial/serial_xuartlite.c | 4 ----
> drivers/serial/usbtty.c | 5 -----
> 13 files changed, 12 insertions(+), 59 deletions(-)

This patch does not apply any more:

error: patch failed: drivers/serial/Makefile:25
error: drivers/serial/Makefile: patch does not apply
error: patch failed: drivers/serial/atmel_usart.c:17
error: drivers/serial/atmel_usart.c: patch does not apply
error: patch failed: drivers/serial/mcfuart.c:29
error: drivers/serial/mcfuart.c: patch does not apply
error: patch failed: drivers/serial/ns9750_serial.c:28
error: drivers/serial/ns9750_serial.c: patch does not apply
error: patch failed: drivers/serial/s3c4510b_uart.c:45
error: drivers/serial/s3c4510b_uart.c: patch does not apply
error: patch failed: drivers/serial/serial.c:23
error: drivers/serial/serial.c: patch does not apply
error: patch failed: drivers/serial/serial_max3100.c:26
error: drivers/serial/serial_max3100.c: patch does not apply
error: patch failed: drivers/serial/serial_sh.c:20
error: drivers/serial/serial_sh.c: patch does not apply
error: patch failed: drivers/serial/serial_xuartlite.c:27
error: drivers/serial/serial_xuartlite.c: patch does not apply
error: patch failed: drivers/serial/usbtty.c:23
error: drivers/serial/usbtty.c: patch does not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merged drivers/serial/Makefile
CONFLICT (content): Merge conflict in drivers/serial/Makefile
Auto-merged drivers/serial/serial.c
Auto-merged drivers/serial/serial_xuartlite.c
Auto-merged drivers/serial/usbtty.c
Failed to merge in the changes.
Patch failed at 0004.

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
Sometimes a man will tell his bartender things he'll never tell his doctor.
-- Dr. Phillip Boyce, "The Menagerie" ("The Cage"),
stardate unknown.