[PATCH] ppc: fix build break

[Vitaly Bordug]

On Thu, 28 Sep 2006 08:41:57 -0500
Kumar Gala <galak at kernel.crashing.org> wrote:

> 
> On Sep 27, 2006, at 11:57 PM, Olof Johansson wrote:
> 
> > Fix build break for some of the ARCH=ppc defconfigs
> >
> > Signed-off-by: Olof Johansson <olof at lixom.net>
> 
> This breakage exists in 2.6.18 as well?  If so would be good to send  
> this patch to -stable if its not already there.
> 

This was addressed in my series, then by Amy Wang, and below :)
Hence I expect it to appear in powerpc.git very shortly, but for -stable it makes sense.


Thanks,
-Vitaly


> - k
> 
> >
> > ---
> >
> > This was introduced by:
> >
> > [PATCH] ppc32: board-specific part of fs_enet update
> >
> >
> > Index: linux-2.6/include/asm-ppc/cpm2.h
> > ===================================================================
> > --- linux-2.6.orig/include/asm-ppc/cpm2.h
> > +++ linux-2.6/include/asm-ppc/cpm2.h
> > @@ -1186,7 +1186,7 @@ typedef struct im_idma {
> >  #define FCC_MEM_OFFSET(x) (CPM_FCC_SPECIAL_BASE + (x*128))
> >  #define FCC1_MEM_OFFSET FCC_MEM_OFFSET(0)
> >  #define FCC2_MEM_OFFSET FCC_MEM_OFFSET(1)
> > -#define FCC2_MEM_OFFSET FCC_MEM_OFFSET(2)
> > +#define FCC3_MEM_OFFSET FCC_MEM_OFFSET(2)
> >
> >  #endif /* __CPM2__ */
> >  #endif /* __KERNEL__ */
> 
> 


-- 
Sincerely, 
Vitaly