25 Apr
2008
25 Apr
'08
9:16 a.m.
In message 480B00F4.6030406@gmail.com you wrote:
This patch enables SPI and MC13783/RTC support for the Litekit board.
Signed-off-by: Magnus Lilja lilja.magnus@gmail.com
board/imx31_litekit/imx31_litekit.c | 12 ++++++++++++ include/configs/imx31_litekit.h | 8 ++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
Does not apply:
Applying i.MX31: Enable SPI and MC13783/RTC support for the Litekit board error: patch failed: board/imx31_litekit/imx31_litekit.c:52 error: board/imx31_litekit/imx31_litekit.c: patch does not apply fatal: sha1 information is lacking or useless (board/imx31_litekit/imx31_litekit.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001.
Please rebase 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: wd@denx.de
The face of war has never changed. Surely it is more logical to heal
than to kill.
-- Surak of Vulcan, "The Savage Curtain", stardate 5906.5