diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:40:13 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-05-30 11:40:13 -0600 |
| commit | d785260e2f57d87de5c059de2dabc3cd31b745f0 (patch) | |
| tree | 3218775e396bde8b8139a8c3a01bb95cdc0822c2 /drivers/pci/host/Kconfig | |
| parent | fdaf36bd360fe1e74b34262ad705ef39d52c12de (diff) | |
| parent | cf28855ba7e03f2e2ce85166c117c7b6100dc710 (diff) | |
Merge branch 'pci/host-generic' into next
* pci/host-generic:
MAINTAINERS: Add generic PCI host controller driver
PCI: generic: Add generic PCI host controller driver
Conflicts:
drivers/pci/host/Kconfig
drivers/pci/host/Makefile
Diffstat (limited to 'drivers/pci/host/Kconfig')
| -rw-r--r-- | drivers/pci/host/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 24d290d097b..21df477be0c 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -39,4 +39,11 @@ config PCI_RCAR_GEN2_PCIE help Say Y here if you want PCIe controller support on R-Car Gen2 SoCs. +config PCI_HOST_GENERIC + bool "Generic PCI host controller" + depends on ARM && OF + help + Say Y here if you want to support a simple generic PCI host + controller, such as the one emulated by kvmtool. + endmenu |