summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/board-trout.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-13 15:12:02 -0700
committerKevin Hilman <khilman@linaro.org>2013-08-13 15:12:20 -0700
commitbee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5 (patch)
tree1ca5384ec71f31bd9ae04d867952ca2ced00fe11 /arch/arm/mach-msm/board-trout.c
parent311b79bb7e253dc5916db6dc14374dae0cd4ff9c (diff)
parent3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1 (diff)
downloadop-kernel-dev-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.zip
op-kernel-dev-bee22087faf5bbf33fcb61e6c5e8f8ef7ebd77a5.tar.gz
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-trout.c')
-rw-r--r--arch/arm/mach-msm/board-trout.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 64a46eb..ccf6621 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -25,7 +25,6 @@
#include <asm/mach/map.h>
#include <asm/setup.h>
-#include <mach/board.h>
#include <mach/hardware.h>
#include <mach/msm_iomap.h>
OpenPOWER on IntegriCloud