Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24c53a66 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-iproc' into next

* pci/host-iproc:
  PCI: iproc: Add PCI_DOMAIN dependency to PCI Kconfig
parents 7284a62d e584b06c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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