Re: [PATCH 18/24] powerpc: Base support for 440GX Taishan eval board

[Benjamin Herrenschmidt <benh@kernel.crashing.org>]

On Fri, 2007-11-30 at 15:32 -0600, Josh Boyer wrote:
> On Sat, 01 Dec 2007 07:57:09 +1100
> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> 
> > 
> > On Fri, 2007-11-30 at 14:08 -0600, Josh Boyer wrote:
> > > On Fri, 30 Nov 2007 17:11:01 +1100
> > > Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> > > 
> > > > From: Hugh Blemings <hugh@blemings.org>
> > > > 
> > > > 
> > > > Signed-off-by: Hugh Blemings <hugh@blemings.org>
> > > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > > > ---
> > > > 
> > > > This needs a bit of cleanup still, probably not to be merged as-is
> > > > just yet (like using mtdcri/mfdcri for CPR access).
> > > > 
> > > >  arch/powerpc/Kconfig.debug           |    6 
> > > >  arch/powerpc/boot/44x.h              |    1 
> > > >  arch/powerpc/boot/Makefile           |    7 
> > > 
> > > Small conflict in the Makefile keeps this from applying cleanly.
> > 
> > Can you tell me more ? doesn't conflict here.
> 
> You have cuImage.bamboo with a comment in front of it.

Oh... yeah, ok, my bad, I see where that comes from. I'll fix it up.

Cheers,
Ben.