linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ppc: fix build break
@ 2006-09-28  4:57 Olof Johansson
  2006-09-28 13:41 ` Kumar Gala
  0 siblings, 1 reply; 3+ messages in thread
From: Olof Johansson @ 2006-09-28  4:57 UTC (permalink / raw)
  To: paulus, galak, Vitaly Bordug; +Cc: linuxppc-dev

Fix build break for some of the ARCH=ppc defconfigs

Signed-off-by: Olof Johansson <olof@lixom.net>


---

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__ */

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ppc: fix build break
  2006-09-28  4:57 [PATCH] ppc: fix build break Olof Johansson
@ 2006-09-28 13:41 ` Kumar Gala
  2006-09-28 14:01   ` Vitaly Bordug
  0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2006-09-28 13:41 UTC (permalink / raw)
  To: Olof Johansson; +Cc: linuxppc-dev, paulus


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@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.

- 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__ */

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ppc: fix build break
  2006-09-28 13:41 ` Kumar Gala
@ 2006-09-28 14:01   ` Vitaly Bordug
  0 siblings, 0 replies; 3+ messages in thread
From: Vitaly Bordug @ 2006-09-28 14:01 UTC (permalink / raw)
  To: Kumar Gala; +Cc: Olof Johansson, linuxppc-dev, paulus

On Thu, 28 Sep 2006 08:41:57 -0500
Kumar Gala <galak@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@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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2006-09-28 14:01 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-28  4:57 [PATCH] ppc: fix build break Olof Johansson
2006-09-28 13:41 ` Kumar Gala
2006-09-28 14:01   ` Vitaly Bordug

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).