Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[pandora-kernel.git] / drivers / pci / Kconfig

diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index b42798f..b6f9749 100644 (file)
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -60,9 +60,13 @@ config HT_IRQ
 
           If unsure say Y.
 
+config PCI_ATS
+       bool
+
 config PCI_IOV
        bool "PCI IOV support"
        depends on PCI
+       select PCI_ATS
        help
          I/O Virtualization is a PCI feature supported by some devices
          which allows them to create virtual devices which share their
@@ -70,6 +74,28 @@ config PCI_IOV
 
          If unsure, say N.
 
+config PCI_PRI
+       bool "PCI PRI support"
+       select PCI_ATS
+       help
+         PRI is the PCI Page Request Interface. It allows PCI devices that are
+         behind an IOMMU to recover from page faults.
+
+         If unsure, say N.
+
+config PCI_PASID
+       bool "PCI PASID support"
+       depends on PCI
+       select PCI_ATS
+       help
+         Process Address Space Identifiers (PASIDs) can be used by PCI devices
+         to access more than one IO address space at the same time. To make
+         use of this feature an IOMMU is required which also supports PASIDs.
+         Select this option if you have such an IOMMU and want to compile the
+         driver for it into your kernel.
+
+         If unsure, say N.
+
 config PCI_IOAPIC
        bool
        depends on PCI