diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 20:33:42 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-27 20:33:42 (GMT) |
| commit | a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd (patch) | |
| tree | 327a48bb1acf009d521f0b025a203701d83451b6 /drivers/pci | |
| parent | b9ea44bf2c70b08b9ab3f3d71c2d16d6a134d35e (diff) | |
| parent | 61d9e854dfb91b46b99ffd3d31fc7d45d2b95f31 (diff) | |
| download | linux-a9f8094aaedc7bc21e9232ea5120eaf2e0c824fd.tar.xz | |
Merge tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"Enumeration:
Revert x86 pcibios_alloc_irq() to fix regression (Bjorn Helgaas)
Marvell MVEBU host bridge driver:
Restrict build to 32-bit ARM (Thierry Reding)"
* tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: mvebu: Restrict build to 32-bit ARM
Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()"
Revert "PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed"
Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig index 75a6054..d1cdd9c 100644 --- a/drivers/pci/host/Kconfig +++ b/drivers/pci/host/Kconfig @@ -14,6 +14,7 @@ config PCI_DRA7XX config PCI_MVEBU bool "Marvell EBU PCIe controller" depends on ARCH_MVEBU || ARCH_DOVE + depends on ARM depends on OF config PCIE_DW |