[U-Boot] [PATCH v2 08/10] MPC512x FEC: get rid of duplicated struct ethernet_regs

Wolfgang Denk wd at denx.de
Thu May 28 22:16:17 CEST 2009


Dear Ben Warren,

In message <4A1B8F6F.4030905 at gmail.com> you wrote:
> 
> Wolfgang Denk wrote:
> > Use existing struct fec512x instead.
> >
> > Signed-off-by: Wolfgang Denk <wd at denx.de>
> > Cc: John Rigby <jcrigby at gmail.com>
> > ---
> >  drivers/net/mpc512x_fec.c |   13 +++--
> >  drivers/net/mpc512x_fec.h |  128 +--------------------------------------------
> >  2 files changed, 10 insertions(+), 131 deletions(-)
> >   
> I can't apply this patch:
> 
> Applying MPC512x FEC: get rid of duplicated struct ethernet_regs
> fatal: patch fragment without header at line 206: @@ -180,7 +56,7 @@ typedef struct {
> Patch failed at 0001.
> When you have resolved this problem run "git-am --resolved".
> If you would prefer to skip this patch, instead run "git-am --skip".
> 
> Any idea what's going on?

The whole patch series applies to the "next" branch. I just verified
that it still applies cleanly (git-am) against gurrent next.

Error message above makes me think your file might have been
corrupted?

If you agree with the patch, then just ACK it, and I pull everything
into the 5xxx repo.

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
A right is not what someone gives you; it's what no one can take from
you.                                                   - Ramsey Clark


More information about the U-Boot mailing list