diff options
| author | Joerg Roedel | 2016-07-12 13:26:59 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2016-07-12 13:26:59 +0200 |
| commit | c3928e75158e846a61369207ce417a0a9ce71a0f (patch) | |
| tree | 6899e00dfd654456e3114d4628bc307d067bebcf /drivers/iommu/arm-smmu-v3.c | |
| parent | Linux 4.7-rc7 (diff) | |
| parent | iommu/arm-smmu: Use devm_request_irq and devm_free_irq (diff) | |
| download | kernel-qcow2-linux-c3928e75158e846a61369207ce417a0a9ce71a0f.tar.gz kernel-qcow2-linux-c3928e75158e846a61369207ce417a0a9ce71a0f.tar.xz kernel-qcow2-linux-c3928e75158e846a61369207ce417a0a9ce71a0f.zip | |
Merge branch 'for-joerg/arm-smmu/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into arm/smmu
Diffstat (limited to 'drivers/iommu/arm-smmu-v3.c')
| -rw-r--r-- | drivers/iommu/arm-smmu-v3.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 5f6b3bcab078..ce801170d5f2 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c @@ -2687,6 +2687,8 @@ static int __init arm_smmu_init(void) if (ret) return ret; + pci_request_acs(); + return bus_set_iommu(&pci_bus_type, &arm_smmu_ops); } |