[U-Boot] [PATCH 07/11] block: Clean drivers/block/Makefile

[Wolfgang Denk]

Dear monstr at seznam.cz,

In message <1216057545-18698-7-git-send-email-monstr at seznam.cz> you wrote:
> From: Michal Simek <monstr at monstr.eu>
> 
> 
> Signed-off-by: Michal Simek <monstr at monstr.eu>
> ---
>  drivers/block/Makefile    |   10 +++++-----
>  drivers/block/ahci.c      |    3 ---
>  drivers/block/ata_piix.c  |    4 ----
>  drivers/block/sil680.c    |    4 +---
>  drivers/block/sym53c8xx.c |    5 -----
>  drivers/block/systemace.c |    3 ---
>  6 files changed, 6 insertions(+), 23 deletions(-)

Oops, wrong message sent.

Applying block: Clean drivers/block/Makefile
error: patch failed: drivers/block/Makefile:25
error: drivers/block/Makefile: patch does not apply
error: patch failed: drivers/block/ahci.c:26
error: drivers/block/ahci.c: patch does not apply
error: patch failed: drivers/block/ata_piix.c:35
error: drivers/block/ata_piix.c: patch does not apply
error: patch failed: drivers/block/sil680.c:54
error: drivers/block/sil680.c: patch does not apply
error: patch failed: drivers/block/sym53c8xx.c:35
error: drivers/block/sym53c8xx.c: patch does not apply
error: patch failed: drivers/block/systemace.c:44
error: drivers/block/systemace.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/block/Makefile
CONFLICT (content): Merge conflict in drivers/block/Makefile
Auto-merged drivers/block/sil680.c
CONFLICT (content): Merge conflict in drivers/block/sil680.c
Auto-merged drivers/block/sym53c8xx.c
Failed to merge in the changes.
Patch failed at 0007.


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
Q:  How do you play religious roulette?
A:  You stand around in a circle  and  blaspheme  and  see  who  gets
    struck by lightning first.