Skip to contentSkip to conversation

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

PATCH In review Peter Huewe 4 participants 4 messages Apr 28, 2010 – May 2, 2010

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm Qualcomm mailing list Kernel janitors
lore
Share & tools
lore

Peter Huewe

author
#0 lore raw

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

From: Peter Huewe <[email protected]>

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 <[email protected]>

---
KernelVersion: linux-next-20100429

 arch/arm/mach-msm/board-trout.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-msm/board-trout.c +2 -0
index 9793ff4..b88aec2 100644
@@ -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,
Signature · 1 line
1.6.4.4
#1 lore raw
Quoted 9 lines · Peter Huewe

From: Peter Huewe <[email protected]>

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 <[email protected]>

Ack.

Quoted 21 lines

---
KernelVersion: linux-next-20100429

 arch/arm/mach-msm/board-trout.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
arch/arm/mach-msm/board-trout.c +2 -0
index 9793ff4..b88aec2 100644
@@ -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,
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Acked-by Russell King on v1 1/1
#2 lore raw
In reply to Peter Huewe
Quoted 9 lines · Peter Huewe

From: Peter Huewe <[email protected]>

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 <[email protected]>
Acked-by Russell King <[email protected]>

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

#3 lore raw
Quoted 6 lines · Russell King - ARM Linux
Quoted 5 lines · Peter Huewe

From: Peter Huewe <[email protected]>

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.

Quoted 8 lines
Quoted 4 lines

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

Signed-off-by Peter Huewe <[email protected]>
Acked-by Russell King <[email protected]>

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

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

Daniel