Merge tag 'nfsd-5.5' of git://linux-nfs.org/~bfields/linux

[linux-2.6-microblaze.git] / drivers / iommu / Kconfig

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index f1086ea..0b9d78a 100644 (file)
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -3,6 +3,10 @@
 config IOMMU_IOVA
        tristate
 
+# The IOASID library may also be used by non-IOMMU_API users
+config IOASID
+       tristate
+
 # IOMMU_API always gets selected by whoever wants it.
 config IOMMU_API
        bool
@@ -138,6 +142,7 @@ config AMD_IOMMU
        select PCI_PASID
        select IOMMU_API
        select IOMMU_IOVA
+       select IOMMU_DMA
        depends on X86_64 && PCI && ACPI
        ---help---
          With this option you can enable support for AMD IOMMU hardware in
@@ -207,6 +212,7 @@ config INTEL_IOMMU_SVM
        bool "Support for Shared Virtual Memory with Intel IOMMU"
        depends on INTEL_IOMMU && X86
        select PCI_PASID
+       select PCI_PRI
        select MMU_NOTIFIER
        help
          Shared Virtual Memory (SVM) provides a facility for devices