On 18:59 Sat 26 Jul , Hunter, Jon wrote: > Add support to drivers/usb/usbdcore_omap1510.c for OMAP5912 and OMAP16xx > devices. > > Signed-off-by: Jon Hunter <[EMAIL PROTECTED]> > --- > drivers/usb/usbdcore_omap1510.c | 27 ++++++++++++++++++++++++--- > 1 files changed, 24 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c > index 84bb936..61c0d3b 100644 > --- a/drivers/usb/usbdcore_omap1510.c > +++ b/drivers/usb/usbdcore_omap1510.c > @@ -28,7 +28,7 @@ Applyinf failled
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... error: patch failed: drivers/usb/usbdcore_omap1510.c:1109 error: drivers/usb/usbdcore_omap1510.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Could you send a V2 rebase on the current tree? Best Regards, J. ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
