diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 11:45:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-03 11:45:48 -0400 |
| commit | f16c15a0e0ea88d95b49467a90f71017604e6a5d (patch) | |
| tree | e13699daa88727f9318afd82dfde4572e1977084 | |
| parent | 51fe4d3baeaa976ca71e228f09950a960d4f7430 (diff) | |
| parent | 8d7004a6904cf089e0ebfe5a27e9674cee5db9dc (diff) | |
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
| -rw-r--r-- | drivers/pci/host/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 8922c376456a..90f5ccacce4b 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig | |||
| @@ -56,7 +56,7 @@ config PCI_HOST_GENERIC | |||
| 56 | controller, such as the one emulated by kvmtool. | 56 | controller, such as the one emulated by kvmtool. |
| 57 | 57 | ||
| 58 | config PCIE_SPEAR13XX | 58 | config PCIE_SPEAR13XX |
| 59 | tristate "STMicroelectronics SPEAr PCIe controller" | 59 | bool "STMicroelectronics SPEAr PCIe controller" |
| 60 | depends on ARCH_SPEAR13XX | 60 | depends on ARCH_SPEAR13XX |
| 61 | select PCIEPORTBUS | 61 | select PCIEPORTBUS |
| 62 | select PCIE_DW | 62 | select PCIE_DW |