[U-Boot] [PATCH v2 2/4] macb: support higher rate GEM MDIO clock divisors

Wolfgang Denk wd at denx.de
Tue Dec 6 21:26:05 CET 2011


Dear Dave Aldridge,

In message <1318251753-23604-2-git-send-email-fovsoft at gmail.com> you wrote:
> GEM devices support larger clock divisors and have a different
> range of divisors.  Program the MDIO clock divisors based on the
> device type.
> 
> Signed-off-by: Dave Aldridge <fovsoft at gmail.com>
> ---
>  drivers/net/macb.c |   63 ++++++++++++++++++++++++++++++++++++++--------------
>  drivers/net/macb.h |   12 ++++++++++
>  2 files changed, 58 insertions(+), 17 deletions(-)

No, not applied - doesn't apply:

Description: [U-Boot,2/4] macb: support higher rate GEM MDIO clock
divisors
Applying: macb: support higher rate GEM MDIO clock divisors
fatal: sha1 information is lacking or useless (drivers/net/macb.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 macb: support higher rate GEM MDIO clock divisors


Please fix / 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 at denx.de
"This is a test of the Emergency Broadcast System. If this had been an
actual emergency, do you really think we'd stick around to tell you?"


More information about the U-Boot mailing list