diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-11-19 13:01:56 +0300 |
| commit | 4b131c9bf8af9bc7a25441251f60a8ca7fc69c07 (patch) | |
| tree | ba0bc4861f2f606b088b09c53389f06e88a69894 /drivers/iommu/Makefile | |
| parent | d4e209db57abe07163fe84b43b533a4b6246b0c3 (diff) | |
| parent | 08fad54a88981323247c7199ccbb8d42c596466a (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroHEADll-20151119.0linux-linaro-4.3-2015.11ll_20151119.0linux-linaro
Conflicting files:
Diffstat (limited to 'drivers/iommu/Makefile')
| -rw-r--r-- | drivers/iommu/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index c6dcc513d711..c665bbb5704d 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -5,7 +5,8 @@ obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o obj-$(CONFIG_IOMMU_IOVA) += iova.o obj-$(CONFIG_OF_IOMMU) += of_iommu.o -obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o +obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o +obj-$(CONFIG_QCOM_IOMMU_V1) += qcom/ obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o obj-$(CONFIG_ARM_SMMU) += arm-smmu.o |