diff options
| author | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-01-28 11:31:53 -0800 |
| commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
| tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/board-trout.c | |
| parent | d1f4cec78ee3141a78b2b35969f5bebf7ea9b208 (diff) | |
| parent | 07a3cc4814f790354d4c7be2c9dc6143a714a07a (diff) | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: Clean up useless ifdefs
msm: clock: Add support for more proc_comm clocks
msm: clock: Invert debugfs directory layout
msm: clock: Move debugfs code from clock.c to clock-debug.c
msm: clock: Remove 7x30 and pcom includes from clock.h
msm: clock: Remove unused code and definitions
msm: Warning fix in trout gpio board file
msm: Remove broken register definition from trout
Diffstat (limited to 'arch/arm/mach-msm/board-trout.c')
| -rw-r--r-- | arch/arm/mach-msm/board-trout.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index 73f14606654..8448687f5a4 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -92,8 +92,6 @@ static void __init trout_map_io(void) } MACHINE_START(TROUT, "HTC Dream") -#ifdef CONFIG_MSM_DEBUG_UART -#endif .boot_params = 0x10000100, .fixup = trout_fixup, .map_io = trout_map_io, |