In message <[EMAIL PROTECTED]> you wrote: > > Add defines that intersects with the libata patch sent by Dave Liu > > Signed-off-by: Tor Krill <[EMAIL PROTECTED]>
error: u-boot/include/ata.h: does not exist in index fatal: sha1 information is lacking or useless (u-boot/include/ata.h). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001. 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] For every complex problem, there is a solution that is simple, neat, and wrong. - Mark Twain ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
