diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-04-22 19:09:03 -0400 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 12:19:37 -0400 |
| commit | 42df2c99162d1da63f11d073059e9633bfec11d0 (patch) | |
| tree | 1f2fa263483a1874eda3df19183e400504137034 /arch/arm | |
| parent | 3a9f346a95d4faa05f4eca6470f971244073e18e (diff) | |
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/arm')
| -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) | |||
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | MACHINE_START(TROUT, "HTC Dream") | 84 | MACHINE_START(TROUT, "HTC Dream") |
| 85 | #ifdef CONFIG_MSM_DEBUG_UART | ||
| 85 | .phys_io = MSM_DEBUG_UART_PHYS, | 86 | .phys_io = MSM_DEBUG_UART_PHYS, |
| 86 | .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, | 87 | .io_pg_offst = ((MSM_DEBUG_UART_BASE) >> 18) & 0xfffc, |
| 88 | #endif | ||
| 87 | .boot_params = 0x10000100, | 89 | .boot_params = 0x10000100, |
| 88 | .fixup = trout_fixup, | 90 | .fixup = trout_fixup, |
| 89 | .map_io = trout_map_io, | 91 | .map_io = trout_map_io, |