diff options
author | Daniel Walker <dwalker@codeaurora.org> | 2010-04-22 16:09:03 -0700 |
---|---|---|
committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 09:19:37 -0700 |
commit | 42df2c99162d1da63f11d073059e9633bfec11d0 (patch) | |
tree | 1f2fa263483a1874eda3df19183e400504137034 /arch | |
parent | 3a9f346a95d4faa05f4eca6470f971244073e18e (diff) | |
download | blackbird-op-linux-42df2c99162d1da63f11d073059e9633bfec11d0.tar.gz blackbird-op-linux-42df2c99162d1da63f11d073059e9633bfec11d0.zip |
arm: msm: trout: fix build failure without UART
Without a debug uart selected you get this failure,
arch/arm/mach-msm/board-trout.c:85: error: 'MSM_DEBUG_UART_PHYS' undeclared here (not in a function)
arch/arm/mach-msm/board-trout.c:86: error: 'MSM_DEBUG_UART_BASE' undeclared here (not in a function)
This just removes these lines in that case.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r-- | 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 9793ff45deb4..b88aec269df5 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, |