aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-08-15 14:59:07 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-08-15 14:59:07 -0500
commit0d56768651fc63691552ea59abc4b2ad07a74241 (patch)
tree39e8d69e367f6d8681655efcde7d13fef3f8fd76 /drivers/pci
parentMerge branch 'pci/virtualization' (diff)
parentPCI/xilinx: Depend on OF instead of the ARCH (diff)
downloadlinux-dev-0d56768651fc63691552ea59abc4b2ad07a74241.tar.xz
linux-dev-0d56768651fc63691552ea59abc4b2ad07a74241.zip
Merge branch 'remotes/lorenzo/pci/controller/misc'
- Remove Xilinx AXI-PCIe host bridge arch dependency (Palmer Dabbelt) * remotes/lorenzo/pci/controller/misc: PCI/xilinx: Depend on OF instead of the ARCH
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/controller/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index cc9fa02d32a0..0f7ce5eaeac8 100644
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -102,7 +102,7 @@ config PCI_HOST_GENERIC
config PCIE_XILINX
bool "Xilinx AXI PCIe host bridge support"
- depends on ARCH_ZYNQ || MICROBLAZE || (MIPS && PCI_DRIVERS_GENERIC) || COMPILE_TEST
+ depends on OF || COMPILE_TEST
help
Say 'Y' here if you want kernel to support the Xilinx AXI PCIe
Host Bridge driver.