[U-Boot] [PATCH 06/11] misc: Clean drivers/misc/Makefile

Wolfgang Denk
2008-08-18T21:30:04Z

Dear monstr at seznam.cz,

In message <1216057545-18698-6-git-send-email-monstr@seznam.cz> you wrote:
> From: Michal Simek <monstr@monstr.eu>
>
>
> Signed-off-by: Michal Simek <monstr@monstr.eu>
> ---
> drivers/misc/Makefile | 6 +++---
> drivers/misc/ali512x.c | 5 -----
> drivers/misc/ns87308.c | 4 ----
> drivers/misc/status_led.c | 4 ----
> 4 files changed, 3 insertions(+), 16 deletions(-)

Applying misc: Clean drivers/misc/Makefile
error: patch failed: drivers/misc/Makefile:25
error: drivers/misc/Makefile: patch does not apply
error: patch failed: drivers/misc/ali512x.c:32
error: drivers/misc/ali512x.c: patch does not apply
error: patch failed: drivers/misc/ns87308.c:23
error: drivers/misc/ns87308.c: patch does not apply
error: patch failed: drivers/misc/status_led.c:35
error: drivers/misc/status_led.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/misc/Makefile
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Failed to merge in the changes.
Patch failed at 0006.

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
God made the integers; all else is the work of Man. - Kronecker