diff options
author | David Brown <davidb@codeaurora.org> | 2011-01-28 20:31:53 +0100 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2011-01-28 20:31:53 +0100 |
commit | ecca8194c16bdf6cde99a2b29c23a77901cd61a6 (patch) | |
tree | 80b533b480b94b1bdc4dad3b0d300868f44cde04 /arch/arm/mach-msm/board-qsd8x50.c | |
parent | Merge branch 'msm-fb' into for-next (diff) | |
parent | msm: Clean up useless ifdefs (diff) | |
download | linux-ecca8194c16bdf6cde99a2b29c23a77901cd61a6.tar.xz linux-ecca8194c16bdf6cde99a2b29c23a77901cd61a6.zip |
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-qsd8x50.c')
-rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 29ef683c8048..b464d48da7c0 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -195,8 +195,6 @@ static void __init qsd8x50_init(void) } MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") -#ifdef CONFIG_MSM_DEBUG_UART -#endif .boot_params = PHYS_OFFSET + 0x100, .map_io = qsd8x50_map_io, .init_irq = qsd8x50_init_irq, @@ -205,8 +203,6 @@ MACHINE_START(QSD8X50_SURF, "QCT QSD8X50 SURF") MACHINE_END MACHINE_START(QSD8X50A_ST1_5, "QCT QSD8X50A ST1.5") -#ifdef CONFIG_MSM_DEBUG_UART -#endif .boot_params = PHYS_OFFSET + 0x100, .map_io = qsd8x50_map_io, .init_irq = qsd8x50_init_irq, |