diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:10 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:10 -0500 |
| commit | 95773672830d49ed6202bfa47cbb752823c96593 (patch) | |
| tree | e4bd2dd52d7ea2f696e58701d0298f138e31d500 /drivers/pci/host/Kconfig | |
| parent | 443b1b06717275a10f4b36fb6330c85b7f37281f (diff) | |
| parent | b0308c5419607c77e5be3c9d388b120ed471037b (diff) | |
| download | linux-95773672830d49ed6202bfa47cbb752823c96593.tar.gz linux-95773672830d49ed6202bfa47cbb752823c96593.tar.bz2 linux-95773672830d49ed6202bfa47cbb752823c96593.zip | |
Merge branch 'pci/host-rockchip' into next
* pci/host-rockchip:
PCI: rockchip: Modularize
PCI: Export pci_remap_iospace() and pci_unmap_iospace()
PCI: rockchip: Add remove() support
PCI: rockchip: Set PCI_EXP_LNKSTA_SLC in the Root Port
PCI: rockchip: Advertise 128-byte Read Completion Boundary support
PCI: rockchip: Make 'return 0' more obvious in probe()
PCI: rockchip: Unindent rockchip_pcie_set_power_limit()
PCI: rockchip: Handle regulator_get_current_limit() failure correctly
Diffstat (limited to 'drivers/pci/host/Kconfig')
| -rw-r--r-- | drivers/pci/host/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 2ce1b19a9ef7..7f47cd5e10a5 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -170,7 +170,7 @@ config PCI_HOST_THUNDER_ECAM Say Y here if you want ECAM support for CN88XX-Pass-1.x Cavium Thunder SoCs. config PCIE_ROCKCHIP - bool "Rockchip PCIe controller" + tristate "Rockchip PCIe controller" depends on ARCH_ROCKCHIP || COMPILE_TEST depends on OF depends on PCI_MSI_IRQ_DOMAIN |