diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 11:45:47 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-20 11:45:47 -0500 |
| commit | b7c18dc06ad12059abc0961522d446553f8a755b (patch) | |
| tree | d5d94228ffacb6df390e7fa7d92c0901a0665ea4 /drivers/pci/Kconfig | |
| parent | 61ce5809570b38710f08ebfcd44a5b067eeee77d (diff) | |
| parent | 8a3ebd8de328301aacbe328650a59253be2ac82c (diff) | |
| download | linux-stable-b7c18dc06ad12059abc0961522d446553f8a755b.tar.gz linux-stable-b7c18dc06ad12059abc0961522d446553f8a755b.tar.bz2 linux-stable-b7c18dc06ad12059abc0961522d446553f8a755b.zip | |
Merge branch 'remotes/lorenzo/pci/controller-misc'
- Remove redundant controller tests for "device_type == pci" (Rob
Herring)
- Document R-Car E3 (R8A77990) bindings (Tho Vu)
- Add device tree support for R-Car r8a7744 (Biju Das)
- Drop unused mvebu PCIe capability code (Thomas Petazzoni)
- Add shared PCI bridge emulation code (Thomas Petazzoni)
- Convert mvebu to use shared PCI bridge emulation (Thomas Petazzoni)
- Add aardvark Root Port emulation (Thomas Petazzoni)
* remotes/lorenzo/pci/controller-misc:
PCI: aardvark: Implement emulated root PCI bridge config space
PCI: mvebu: Convert to PCI emulated bridge config space
PCI: mvebu: Drop unused PCI express capability code
PCI: Introduce PCI bridge emulated config space common logic
dt-bindings: PCI: rcar: Add device tree support for r8a7744
dt-bindings: PCI: rcar: Add device tree support for r8a7744
DT: pci: rcar-pci: document R8A77990 bindings
PCI: Remove unnecessary check of device_type == pci
Diffstat (limited to 'drivers/pci/Kconfig')
| -rw-r--r-- | drivers/pci/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index deb68be4fdac..2dcc30429e8b 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -98,6 +98,9 @@ config PCI_ECAM config PCI_LOCKLESS_CONFIG bool +config PCI_BRIDGE_EMUL + bool + config PCI_IOV bool "PCI IOV support" depends on PCI |