Browse Source

Merge branch 'pci/host-iproc' into next

* pci/host-iproc:
  PCI: iproc: Add PCI_DOMAIN dependency to PCI Kconfig
Bjorn Helgaas 8 years ago
parent
commit
24c53a66bd
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/pci/host/Kconfig

+ 1 - 1
drivers/pci/host/Kconfig

@@ -101,6 +101,7 @@ config PCI_VERSATILE
 
 
 config PCIE_IPROC
 config PCIE_IPROC
 	tristate
 	tristate
+	select PCI_DOMAINS
 	help
 	help
 	  This enables the iProc PCIe core controller support for Broadcom's
 	  This enables the iProc PCIe core controller support for Broadcom's
 	  iProc family of SoCs. An appropriate bus interface driver needs
 	  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)
 	depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
 	select PCIE_IPROC
 	select PCIE_IPROC
 	select BCMA
 	select BCMA
-	select PCI_DOMAINS
 	default ARCH_BCM_5301X
 	default ARCH_BCM_5301X
 	help
 	help
 	  Say Y here if you want to use the Broadcom iProc PCIe controller
 	  Say Y here if you want to use the Broadcom iProc PCIe controller