In message <[EMAIL PROTECTED]> you wrote: > > This patch removes an unused part of the code.
Sorry, this patch cannot be applied. > --- bootm_orig.c 2008-07-15 16:51:03.296875000 -0700 > +++ bootm.c 2008-07-15 16:51:38.250000000 -0700 ... error: bootm.c: does not exist in index fatal: sha1 information is lacking or useless (bootm.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. ... Please read http://www.denx.de/wiki/UBoot/Patches for instructions how to prepare patches. I strongly recommend to use git0format-patch . Please fix 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: [EMAIL PROTECTED] Once upon a time, "PC" meant "personal computer". Now it seems to only mean "Prisoner of Bill". Alas! All my PCs run Unix, and those include Intel, Sparc, and other processors. -- Tom "Bring back the non-PC meaning of `PC'" Christiansen ------------------------------------------------------------------------- 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
