summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-07-07 12:56:44 +0200
committerIngo Molnar <mingo@elte.hu>2011-07-07 12:58:28 +0200
commitb395fb36d59e17b9335805c10fa30fc51c8a94c6 (patch)
treeb96bc8eee33753e2a1b1181c62a028d7f89643d7 /arch/arm/mach-msm/Makefile
parentfe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff)
parent6b385b46ee17d7e1a68d3411b8cdb2342e0f0445 (diff)
downloadlwn-b395fb36d59e17b9335805c10fa30fc51c8a94c6.tar.gz
lwn-b395fb36d59e17b9335805c10fa30fc51c8a94c6.zip
Merge branch 'iommu-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu into core/iommu
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
-rw-r--r--arch/arm/mach-msm/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index 9519fd28a025..b70658c5ae00 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -3,7 +3,7 @@ obj-y += clock.o
obj-$(CONFIG_DEBUG_FS) += clock-debug.o
obj-$(CONFIG_MSM_VIC) += irq-vic.o
-obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o
+obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o
obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
obj-$(CONFIG_ARCH_MSM7X30) += dma.o