diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-13 15:12:02 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-13 15:12:20 -0700 |
| commit | bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5 (patch) | |
| tree | 1ca5384ec71f31bd9ae04d867952ca2ced00fe11 /arch/arm/mach-msm/board-dt-8660.c | |
| parent | 311b79bb7e253dc5916db6dc14374dae0cd4ff9c (diff) | |
| parent | 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1 (diff) | |
| download | talos-op-linux-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.tar.gz talos-op-linux-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.zip | |
Merge branch 'msm/cleanup' into next/cleanup
From David Brown <davidb@codeaurora.org>:
* msm/cleanup:
ARM: msm: Only compile io.c on platforms that use it
iommu/msm: Move mach includes to iommu directory
ARM: msm: Remove devices-iommu.c
ARM: msm: Move mach/board.h contents to common.h
ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
ARM: msm: Remove TMR and TMR0 static mappings
ARM: msm: Move debug-macro.S to include/debug
ARM: msm: Don't compile __msm_ioremap_caller() unless used
ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-msm/board-dt-8660.c')
| -rw-r--r-- | arch/arm/mach-msm/board-dt-8660.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c index 492f5cd87b0a..c2946892f5e3 100644 --- a/arch/arm/mach-msm/board-dt-8660.c +++ b/arch/arm/mach-msm/board-dt-8660.c @@ -15,8 +15,8 @@ #include <linux/of_platform.h> #include <asm/mach/arch.h> +#include <asm/mach/map.h> -#include <mach/board.h> #include "common.h" static void __init msm8x60_init_late(void) @@ -42,9 +42,7 @@ static const char *msm8x60_fluid_match[] __initdata = { DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)") .smp = smp_ops(msm_smp_ops), - .map_io = msm_map_msm8x60_io, .init_machine = msm8x60_dt_init, .init_late = msm8x60_init_late, - .init_time = msm_dt_timer_init, .dt_compat = msm8x60_fluid_match, MACHINE_END |
