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

Commit f16c15a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 51fe4d3b 8d7004a6

drivers/pci/host/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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