Dear Peter Tyser,
In message <[EMAIL PROTECTED]> you wrote:
> Allow tqm8xx.c to cleanly compile when CONFIG_LCD_INFO is
> defined and remove unneeded version.h from lcd.c
>
> Signed-off-by: Peter Tyser <[EMAIL PROTECTED]>
> ---
> I noticed this when adding timestamp.h to tqm8xx.c.
> The "Update U-Boot's build timestamp on every compile"
> patch should be applied first.
Could you please rebase and resubmit that patch? It doesn't apply:
Applying lcd: Let the board code show board-specific info cleanup
error: patch failed: board/tqc/tqm8xx/tqm8xx.c:570
error: board/tqc/tqm8xx/tqm8xx.c: patch does not apply
fatal: sha1 information is lacking or useless
(board/tqc/tqm8xx/tqm8xx.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.
Thanks.
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]
Mr. Cole's Axiom:
The sum of the intelligence on the planet is a constant;
the population is growing.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
