diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-24 22:54:34 +0200 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2013-08-06 20:18:04 +0200 |
commit | 3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1 (patch) | |
tree | bb1d3cc666868c5b3aab6bcb6fefe29b331da097 /arch/arm | |
parent | iommu/msm: Move mach includes to iommu directory (diff) | |
download | linux-3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1.tar.xz linux-3294a7e7c3a55bb4eb9d98b0af5643a7ea44afe1.zip |
ARM: msm: Only compile io.c on platforms that use it
Only the non-dt based MSM platforms need to map memory from their
machine descriptor. Unfortunately it is always compiled if
ARCH_MSM=y and the file also has mach/ includes in it. Since
dt-based MSM platforms aren't actually using anything in this
file just compile io.c on the non-dt based MSM platforms. This
allows the dt-based platforms to participate in the
multi-platform kernel.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-msm/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 4c248ba07d02..d872634c2f85 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,4 @@ -obj-y += io.o timer.o +obj-y += timer.o obj-y += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o @@ -8,9 +8,9 @@ obj-$(CONFIG_ARCH_QSD8X50) += sirc.o obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o -obj-$(CONFIG_ARCH_MSM7X00A) += dma.o -obj-$(CONFIG_ARCH_MSM7X30) += dma.o -obj-$(CONFIG_ARCH_QSD8X50) += dma.o +obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o +obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o +obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o obj-$(CONFIG_MSM_SMD) += last_radio_log.o |