diff options
| author | David Brown <davidb@codeaurora.org> | 2011-02-14 13:43:54 -0800 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-02-14 13:43:54 -0800 |
| commit | 7358cf2073e1abcfb85bb2829f73b2a12b909de6 (patch) | |
| tree | 2f912ba63d1b0156a88f7cc725e8f775412e9600 /arch/arm/mach-msm/Makefile | |
| parent | 2ff9870c4cccf97d777bf5551d22303e0176b201 (diff) | |
| parent | 6499f0a8b3f44141431df79923fb8f1d8017e139 (diff) | |
Merge branch 'msm-core' into for-next
* msm-core:
msm: iommu: Enable IOMMU support for MSM8960
msm: iommu: Generalize platform data for multiple targets
msm: iommu: Create a Kconfig item for the IOMMU driver
Diffstat (limited to 'arch/arm/mach-msm/Makefile')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index ea8c74f56ea..2099c979fe2 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -4,11 +4,12 @@ obj-$(CONFIG_DEBUG_FS) += clock-debug.o endif obj-$(CONFIG_MSM_VIC) += irq-vic.o +obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o obj-$(CONFIG_ARCH_MSM7X30) += dma.o obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o -obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o +obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o obj-$(CONFIG_ARCH_MSM8960) += clock-dummy.o obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o |