diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:00 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:00 -0500 |
| commit | 24c53a66bd687a186f55f0845c08a6d073864798 (patch) | |
| tree | f6249097beb564e2b03df2d0b2bc0f05891e4a9b /drivers/pci | |
| parent | 7284a62dfd7066919bf9a7318f6dbc7b51a092db (diff) | |
| parent | e584b06c4730f1b6d9ccb47fc8b7d79411eb9012 (diff) | |
Merge branch 'pci/host-iproc' into next
* pci/host-iproc:
PCI: iproc: Add PCI_DOMAIN dependency to PCI Kconfig
Diffstat (limited to 'drivers/pci')
| -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 aa23b70d61eb..2ce1b19a9ef7 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -101,6 +101,7 @@ config PCI_VERSATILE config PCIE_IPROC tristate + select PCI_DOMAINS help This enables the iProc PCIe core controller support for Broadcom's iProc family of SoCs. An appropriate bus interface driver needs @@ -121,7 +122,6 @@ config PCIE_IPROC_BCMA depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) select PCIE_IPROC select BCMA - select PCI_DOMAINS default ARCH_BCM_5301X help Say Y here if you want to use the Broadcom iProc PCIe controller |