[U-Boot-Users] [PATCH] ATA: Add missing defines to ata.h

[Wolfgang Denk]

In message <n2tuAEh3.1205933786.7768430.tor at localhost> you wrote:
> 
> Add defines that intersects with the libata patch sent by Dave Liu
> 
> Signed-off-by: Tor Krill <tor at excito.com>

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: wd at denx.de
For every complex problem, there is a solution that is simple,  neat,
and wrong.                                               - Mark Twain