diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 11:33:00 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 11:33:00 -0400 |
| commit | 24c53a66bd687a186f55f0845c08a6d073864798 (patch) | |
| tree | f6249097beb564e2b03df2d0b2bc0f05891e4a9b | |
| 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
| -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 | |||
| 101 | 101 | ||
| 102 | config PCIE_IPROC | 102 | config PCIE_IPROC |
| 103 | tristate | 103 | tristate |
| 104 | select PCI_DOMAINS | ||
| 104 | help | 105 | help |
| 105 | This enables the iProc PCIe core controller support for Broadcom's | 106 | This enables the iProc PCIe core controller support for Broadcom's |
| 106 | iProc family of SoCs. An appropriate bus interface driver needs | 107 | iProc family of SoCs. An appropriate bus interface driver needs |
| @@ -121,7 +122,6 @@ config PCIE_IPROC_BCMA | |||
| 121 | depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) | 122 | depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST) |
| 122 | select PCIE_IPROC | 123 | select PCIE_IPROC |
| 123 | select BCMA | 124 | select BCMA |
| 124 | select PCI_DOMAINS | ||
| 125 | default ARCH_BCM_5301X | 125 | default ARCH_BCM_5301X |
| 126 | help | 126 | help |
| 127 | Say Y here if you want to use the Broadcom iProc PCIe controller | 127 | Say Y here if you want to use the Broadcom iProc PCIe controller |