Skip to contentSkip to conversation

ppc: fix build break

PATCH In review Olof Johansson 3 participants 3 messages Sep 28, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ppc: fix build break

Fix build break for some of the ARCH=ppc defconfigs

---

This was introduced by:

[PATCH] ppc32: board-specific part of fs_enet update

include/asm-ppc/cpm2.h +1 -1
Index: 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__ */
#1 lore raw
Quoted 3 lines · Olof Johansson

Fix build break for some of the ARCH=ppc defconfigs

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

Quoted 21 lines

---

This was introduced by:

[PATCH] ppc32: board-specific part of fs_enet update

Index: linux-2.6/include/asm-ppc/cpm2.h
===================================================================

include/asm-ppc/cpm2.h +1 -1
@@ -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__ */
#2 lore raw
Quoted 10 lines · On Thu, 28 Sep 2006 08:41:57 -0500 Kumar Gala <[email protected]> wrote:
Quoted 3 lines · Olof Johansson

Fix build break for some of the ARCH=ppc defconfigs

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

Quoted 25 lines

- k

Quoted 21 lines

---

This was introduced by:

[PATCH] ppc32: board-specific part of fs_enet update

Index: linux-2.6/include/asm-ppc/cpm2.h
===================================================================

include/asm-ppc/cpm2.h +1 -1
@@ -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__ */
Signature · 2 lines
Sincerely, 
Vitaly