commit f16c15a0e0ea88d95b49467a90f71017604e6a5d
author Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 03 08:45:48 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Sep 03 08:45:48 2014 -0700
tree e13699daa88727f9318afd82dfde4572e1977084
parent 51fe4d3baeaa976ca71e228f09950a960d4f7430
parent 8d7004a6904cf089e0ebfe5a27e9674cee5db9dc

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

drivers/pci/host/Kconfig

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 @@
 	  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