From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ben Warren Date: Thu, 28 May 2009 14:05:48 -0700 Subject: [U-Boot] [PATCH v2 08/10] MPC512x FEC: get rid of duplicated struct ethernet_regs In-Reply-To: <20090528201617.4D028832E416@gemini.denx.de> References: <1241898668-11903-1-git-send-email-wd@denx.de> <1242463666-28583-9-git-send-email-wd@denx.de> <4A1B8F6F.4030905@gmail.com> <20090528201617.4D028832E416@gemini.denx.de> Message-ID: <4A1EFCAC.4090402@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Wolfgang Denk wrote: > Dear Ben Warren, > > In message <4A1B8F6F.4030905@gmail.com> you wrote: > >> Wolfgang Denk wrote: >> >>> Use existing struct fec512x instead. >>> >>> Signed-off-by: Wolfgang Denk >>> Cc: John Rigby >>> --- >>> 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. > > Acked-by: Ben Warren Thanks for taking care of this. I'll look into my repo to figure this out. > Best regards, > > Wolfgang Denk > > regards, Ben