summaryrefslogtreecommitdiffstats
path: root/drivers/pci/host/Kconfig
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2018-06-06 16:10:49 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-06-06 16:10:49 -0500
commit0ecda3a087462eb89c1d9227deea998d8cd014e8 (patch)
treedf588bfe9c79c700639c8cc3addbc9d808a9a165 /drivers/pci/host/Kconfig
parent73144d77cb87d60b4bcab6992a62d6787b09dcf0 (diff)
parentf3fdfc4ac3a26865e84627a7fe08a906081e5abc (diff)
downloadlinux-0ecda3a087462eb89c1d9227deea998d8cd014e8.tar.gz
linux-0ecda3a087462eb89c1d9227deea998d8cd014e8.tar.bz2
linux-0ecda3a087462eb89c1d9227deea998d8cd014e8.zip
Merge branch 'pci/kconfig'
- remove unnecessary host controller CONFIG_PCIEPORTBUS Kconfig selections (Bjorn Helgaas) * pci/kconfig: PCI: Remove host driver Kconfig selection of CONFIG_PCIEPORTBUS # Conflicts: # drivers/pci/dwc/Kconfig # drivers/pci/host/Kconfig
Diffstat (limited to 'drivers/pci/host/Kconfig')
-rw-r--r--drivers/pci/host/Kconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 2593c8373f8f..a96e23bda664 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -84,7 +84,6 @@ config PCI_XGENE
bool "X-Gene PCIe controller"
depends on ARM64 || COMPILE_TEST
depends on OF || (ACPI && PCI_QUIRKS)
- select PCIEPORTBUS
help
Say Y here if you want internal PCI support on APM X-Gene SoC.
There are 5 internal PCIe ports available. Each port is GEN3 capable
@@ -211,7 +210,6 @@ config PCIE_MEDIATEK
depends on ARCH_MEDIATEK || COMPILE_TEST
depends on OF
depends on PCI_MSI_IRQ_DOMAIN
- select PCIEPORTBUS
help
Say Y here if you want to enable PCIe controller support on
MediaTek SoCs.