[PATCH] arm/mach-msm: Add CONFIG conditional for board-trout

[PATCH] arm/mach-msm: Add CONFIG conditional for board-trout

[Peter Huewe]

From: Peter Huewe <peterhuewe@gmx.de>

This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a
build failure[1], this is done the same way as for every board in mach-msm.

References:
[1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
---
KernelVersion: linux-next-20100429

 arch/arm/mach-msm/board-trout.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 9793ff4..b88aec2 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -82,8 +82,10 @@ static void __init trout_map_io(void)
 }
 
 MACHINE_START(TROUT, "HTC Dream")
+#ifdef CONFIG_MSM_DEBUG_UART
 	.phys_io	= MSM_DEBUG_UART_PHYS,
 	.io_pg_offst	= ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
+#endif
 	.boot_params	= 0x10000100,
 	.fixup		= trout_fixup,
 	.map_io		= trout_map_io,
-- 
1.6.4.4

[PATCH] arm/mach-msm: Add CONFIG conditional for board-trout

[Pavel Machek]

On Thu 2010-04-29 02:41:22, Peter Huewe wrote:
> From: Peter Huewe <peterhuewe@gmx.de>
> 
> This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a
> build failure[1], this is done the same way as for every board in mach-msm.
> 
> References:
> [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/
> 
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

Ack.


> ---
> KernelVersion: linux-next-20100429
> 
>  arch/arm/mach-msm/board-trout.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
> index 9793ff4..b88aec2 100644
> --- a/arch/arm/mach-msm/board-trout.c
> +++ b/arch/arm/mach-msm/board-trout.c
> @@ -82,8 +82,10 @@ static void __init trout_map_io(void)
>  }
>  
>  MACHINE_START(TROUT, "HTC Dream")
> +#ifdef CONFIG_MSM_DEBUG_UART
>  	.phys_io	= MSM_DEBUG_UART_PHYS,
>  	.io_pg_offst	= ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc,
> +#endif
>  	.boot_params	= 0x10000100,
>  	.fixup		= trout_fixup,
>  	.map_io		= trout_map_io,

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[PATCH] arm/mach-msm: Add CONFIG conditional for board-trout

[Russell King - ARM Linux]

On Thu, Apr 29, 2010 at 02:41:22AM +0200, Peter Huewe wrote:
> From: Peter Huewe <peterhuewe@gmx.de>
> 
> This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a
> build failure[1], this is done the same way as for every board in mach-msm.
> 
> References:
> [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/
> 
> Signed-off-by: Peter Huewe <peterhuewe@gmx.de>

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>

Who's going to deal with getting this patch upstream?

[PATCH] arm/mach-msm: Add CONFIG conditional for board-trout

[Daniel Walker]

On Sat, 2010-05-01 at 11:14 +0100, Russell King - ARM Linux wrote:
> On Thu, Apr 29, 2010 at 02:41:22AM +0200, Peter Huewe wrote:
> > From: Peter Huewe <peterhuewe@gmx.de>
> > 
> > This patch adds a conditional for CONFIG_MSM_DEBUG_UART to prevent a
> > build failure[1], this is done the same way as for every board in mach-msm.
> > 
> > References:
> > [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2448102/
> > 
> > Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
> 
> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
> 
> Who's going to deal with getting this patch upstream?

I am .. I have a similar patch in my next tree already.

Daniel