diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 15:42:49 +0300 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 15:42:49 +0300 |
| commit | fd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch) | |
| tree | 84d8c5596df7f6eb295ac380b8ddb983af6c906d /drivers/iommu/Makefile | |
| parent | 89aa57d15f1833323b001c3764141311ac6179a2 (diff) | |
| parent | 16753322983bcca0eca6d81f20d23277df0d6cf7 (diff) | |
| download | linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.tar.xz | |
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'drivers/iommu/Makefile')
| -rw-r--r-- | drivers/iommu/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 7b976f294a69..d6889b487d55 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile @@ -1,6 +1,8 @@ obj-$(CONFIG_IOMMU_API) += iommu.o obj-$(CONFIG_IOMMU_API) += iommu-traces.o obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o +obj-$(CONFIG_IOMMU_IO_PGTABLE) += io-pgtable.o +obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += io-pgtable-arm.o obj-$(CONFIG_OF_IOMMU) += of_iommu.o obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o |