| commit | 49d11527e560f7b62bd740d42e01d895e1d7a606 | [log] [tgz] |
|---|---|---|
| author | Joerg Roedel <jroedel@suse.de> | Fri Apr 16 17:16:03 2021 +0200 |
| committer | Joerg Roedel <jroedel@suse.de> | Fri Apr 16 17:16:03 2021 +0200 |
| tree | 9b536898ec950e419ec08b193620cd3049845f73 | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef [diff] [blame] | |
| parent | 3431c3f660a39f6ced954548a59dba6541ce3eb1 [diff] [blame] | |
| parent | ac304c070c54413efabf29f9e73c54576d329774 [diff] [blame] | |
| parent | fe99782702bfa30aaeee1cb05e551c18e31a6be7 [diff] [blame] | |
| parent | d0272ea1839b2fd013f11289c22166005ef774ce [diff] [blame] | |
| parent | a56af062ae7cdc9759ed61d1d3d173f28c79510a [diff] [blame] | |
| parent | 38c527aeb41926c71902dd42f788a8b093b21416 [diff] [blame] | |
| parent | 304c73ba69459d4c18c2a4b843be6f5777b4b85c [diff] [blame] | |
| parent | 84b6269c3c28b920088d4d5ae3723dc740221ae9 [diff] [blame] |
Merge branches 'iommu/fixes', 'arm/mediatek', 'arm/smmu', 'arm/exynos', 'unisoc', 'x86/vt-d', 'x86/amd' and 'core' into next
diff --git a/drivers/iommu/Makefile b/drivers/iommu/Makefile index 61bd30c..c0fb0ba 100644 --- a/drivers/iommu/Makefile +++ b/drivers/iommu/Makefile
@@ -27,4 +27,5 @@ obj-$(CONFIG_S390_IOMMU) += s390-iommu.o obj-$(CONFIG_HYPERV_IOMMU) += hyperv-iommu.o obj-$(CONFIG_VIRTIO_IOMMU) += virtio-iommu.o -obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o +obj-$(CONFIG_IOMMU_SVA_LIB) += iommu-sva-lib.o io-pgfault.o +obj-$(CONFIG_SPRD_IOMMU) += sprd-iommu.o