* [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option
@ 2011-03-18 17:18 Alexandre Bounine
2011-03-18 20:49 ` Kumar Gala
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Bounine @ 2011-03-18 17:18 UTC (permalink / raw)
To: akpm, linux-kernel, linuxppc-dev; +Cc: Alexandre Bounine, Thomas Moll
Follows set of patches in -mm tree. Replaces configuration option
missed in previous patches.
Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option
2011-03-18 17:18 [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option Alexandre Bounine
@ 2011-03-18 20:49 ` Kumar Gala
2011-03-18 20:53 ` Bounine, Alexandre
0 siblings, 1 reply; 3+ messages in thread
From: Kumar Gala @ 2011-03-18 20:49 UTC (permalink / raw)
To: Alexandre Bounine; +Cc: linux-kernel, Thomas Moll, akpm, linuxppc-dev
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 <alexandre.bounine@idt.com>
> ---
> arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Alex, I can push this via the powerpc.git tree route if you want.
- k
^ permalink raw reply [flat|nested] 3+ messages in thread
* RE: [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option
2011-03-18 20:49 ` Kumar Gala
@ 2011-03-18 20:53 ` Bounine, Alexandre
0 siblings, 0 replies; 3+ messages in thread
From: Bounine, Alexandre @ 2011-03-18 20:53 UTC (permalink / raw)
To: Kumar Gala; +Cc: linux-kernel, Thomas Moll, akpm, linuxppc-dev
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 <alexandre.bounine@idt.com>
> ---
> arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Alex, I can push this via the powerpc.git tree route if you want.
- k
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-18 20:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-18 17:18 [PATCH -mm] RapidIO,powerpc/85xx: Fix configuration option Alexandre Bounine
2011-03-18 20:49 ` Kumar Gala
2011-03-18 20:53 ` Bounine, Alexandre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox