summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-03 08:45:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-03 08:45:48 -0700
commitf16c15a0e0ea88d95b49467a90f71017604e6a5d (patch)
treee13699daa88727f9318afd82dfde4572e1977084 /drivers/pci
parent51fe4d3baeaa976ca71e228f09950a960d4f7430 (diff)
parent8d7004a6904cf089e0ebfe5a27e9674cee5db9dc (diff)
downloadop-kernel-dev-f16c15a0e0ea88d95b49467a90f71017604e6a5d.zip
op-kernel-dev-f16c15a0e0ea88d95b49467a90f71017604e6a5d.tar.gz
Merge tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas: "This fixes an ARM allmodconfig build problem: Remove module option for ST Microelectronics SPEAr13xx" * tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI: spear: Remove module option
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/host/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 8922c37..90f5cca 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -56,7 +56,7 @@ config PCI_HOST_GENERIC
controller, such as the one emulated by kvmtool.
config PCIE_SPEAR13XX
- tristate "STMicroelectronics SPEAr PCIe controller"
+ bool "STMicroelectronics SPEAr PCIe controller"
depends on ARCH_SPEAR13XX
select PCIEPORTBUS
select PCIE_DW
OpenPOWER on IntegriCloud