diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-11-05 11:28:53 -0500 |
| commit | 7b4bc1011182bacd5bec8bf6c2c5096ecbb80061 (patch) | |
| tree | 5a27abbe0cefb4e5b076e19dee7a9480727e5f28 /drivers/pci/controller/Kconfig | |
| parent | Merge branch 'pci/host/rcar' (diff) | |
| parent | PCI: vmd: depend on !UML (diff) | |
| download | linux-dev-7b4bc1011182bacd5bec8bf6c2c5096ecbb80061.tar.xz linux-dev-7b4bc1011182bacd5bec8bf6c2c5096ecbb80061.zip | |
Merge branch 'remotes/lorenzo/pci/vmd'
- Assign a number to each VMD controller to distinguish them in
/proc/interrupts (Chunguang Xu)
- Don't disable VMD MSI-X remapping if IOMMU remapping is enabled (Adrian
Huang)
- Add Kconfig dependency on !UML for allyesconfig build issue (Johannes
Berg)
* remotes/lorenzo/pci/vmd:
PCI: vmd: depend on !UML
PCI: vmd: Do not disable MSI-X remapping if interrupt remapping is enabled by IOMMU
PCI: vmd: Assign a number to each VMD controller
Diffstat (limited to 'drivers/pci/controller/Kconfig')
| -rw-r--r-- | drivers/pci/controller/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig index 18f1fa4bdf06..e917bb3652bb 100644 --- a/drivers/pci/controller/Kconfig +++ b/drivers/pci/controller/Kconfig @@ -254,7 +254,7 @@ config PCIE_MEDIATEK_GEN3 MediaTek SoCs. config VMD - depends on PCI_MSI && X86_64 && SRCU + depends on PCI_MSI && X86_64 && SRCU && !UML tristate "Intel Volume Management Device Driver" help Adds support for the Intel Volume Management Device (VMD). VMD is a |