Follows set of patches in -mm tree. Replaces configuration option
missed in previous patches.
Signed-off-by: Alexandre Bounine <redacted>
---
arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 5c518ad..9136111 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -64,7 +64,7 @@ _GLOBAL(__setup_cpu_e500v2)
bl __e500_icache_setup
bl __e500_dcache_setup
bl __setup_e500_ivors
-#ifdef CONFIG_RAPIDIO
+#ifdef CONFIG_FSL_RIO
/* Ensure that RFXE is set */
mfspr r3,SPRN_HID1
oris r3,r3,HID1_RFXE@h
--
1.7.3.1
On Mar 18, 2011, at 12:18 PM, Alexandre Bounine wrote:
Follows set of patches in -mm tree. Replaces configuration option
missed in previous patches.
Signed-off-by: Alexandre Bounine <redacted>
---
arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Acked-by: Kumar Gala <redacted>
Alex, I can push this via the powerpc.git tree route if you want.
- k
This patch has to be applied to -mm tree. Andrew already has set of
patches that change RapidIO configuration.
I think it will be better if it goes into -mm to keep things aligned
properly.
Alex.
-----Original Message-----
From: Kumar Gala [mailto:galak@kernel.crashing.org]=20
Sent: Friday, March 18, 2011 4:49 PM
To: Bounine, Alexandre
Cc: akpm@linux-foundation.org; linux-kernel@vger.kernel.org;
linuxppc-dev@lists.ozlabs.org; Matt Porter; Li Yang; Thomas Moll
Subject: Re: [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option
On Mar 18, 2011, at 12:18 PM, Alexandre Bounine wrote:
Follows set of patches in -mm tree. Replaces configuration option
missed in previous patches.
=20
Signed-off-by: Alexandre Bounine <redacted>
---
arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Acked-by: Kumar Gala <redacted>
Alex, I can push this via the powerpc.git tree route if you want.
- k