On Wed, 7 Apr 2010 15:32:52 +0200 Rini van Zetten <r...@arvoo.nl> wrote:
> Enable eSDHC Clock based on generic CONFIG_FSL_ESDHC define instead of a > platform define. > This will enable all the 83xx platforms to use sdhc_clk based on > CONFIG_FSL_ESDHC. > It's the same patch as commit 6b9ea08c5010eab5ad1056bc9bf033afb672d9cc for > the ppc/85x > > Signed-off-by: Rini <r...@arvoo.nl> > --- Hi Rini, Thanks for this, but I get the following when trying to git am it: Applying: ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk Using index info to reconstruct a base tree... error: patch failed: cpu/mpc83xx/speed.c:116 error: cpu/mpc83xx/speed.c: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 ppc/83xx Use CONFIG_FSL_ESDHC to enable sdhc clk can you please consult: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob;f=Documentation/email-clients.txt;h=945ff3fda4337b089515dfced483fee7b941edcf;hb=HEAD for how to use your User-Agent: Thunderbird 2.0.0.24 (X11/20100317), and try submitting again? Try the submit-apply cycle by emailing the patch to yourself first, and see if you can apply it successfully. And whilst you're there, please prepend patch subject with "mpc83xx:" (instead of "ppc/83xx"), and word wrap your commit message to 75 characters, so it is instantly viewable without having to scroll horizontally during a git log session. Technically you shouldn't have to rebase on top of the latest (today's) arch/ file location changes, but if you do I won't complain. Thanks, Kim _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
