[U-Boot] [PATCH 02/11] usb: Clean drivers/usb/Makefile

Wolfgang Denk
2008-08-18T21:27:01Z

Dear monstr at seznam.cz,

In message <1216057545-18698-2-git-send-email-monstr@seznam.cz> you wrote:
> From: Michal Simek <monstr@monstr.eu>
>
>
> Signed-off-by: Michal Simek <monstr@monstr.eu>
> ---
> drivers/usb/Makefile | 12 ++++++------
> drivers/usb/isp116x-hcd.c | 3 ---
> drivers/usb/sl811_usb.c | 3 ---
> drivers/usb/usb_ohci.c | 3 ---
> drivers/usb/usbdcore_ep0.c | 3 ---
> drivers/usb/usbdcore_mpc8xx.c | 4 ++--
> drivers/usb/usbdcore_omap1510.c | 2 +-
> 7 files changed, 9 insertions(+), 21 deletions(-)

This patch doesn't apply any more:

error: patch failed: drivers/usb/Makefile:25
error: drivers/usb/Makefile: patch does not apply
error: patch failed: drivers/usb/usbdcore_omap1510.c:28
error: drivers/usb/usbdcore_omap1510.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/usb/Makefile
CONFLICT (content): Merge conflict in drivers/usb/Makefile
Auto-merged drivers/usb/usbdcore_omap1510.c
CONFLICT (content): Merge conflict in drivers/usb/usbdcore_omap1510.c
Failed to merge in the changes.
Patch failed at 0002.

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
In theory, there is no difference between theory and practice. In
practice, however, there is.