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

Peter Huewe PeterHuewe at gmx.de
Wed Apr 28 20:41:22 EDT 2010


From: Peter Huewe <peterhuewe at 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 at 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




More information about the linux-arm-kernel mailing list