summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-02-26 22:00:51 +0100
committerBjorn Helgaas <bhelgaas@google.com>2014-02-26 22:00:51 +0100
commit2c0503f202f597325baae76e9f5686518e5ed0dd (patch)
tree369e429d82647b9c3bdeda4513fe15e578c6a987 /drivers/pci
parentMerge branch 'pci/dead-code' into next (diff)
parentPCI: designware: Fix RC BAR to be single 64-bit non-prefetchable memory BAR (diff)
parentPCI: imx6: Wait for retraining (diff)
parentPCI: rcar: Make the Kconfig dependencies more generic (diff)
downloadlinux-2c0503f202f597325baae76e9f5686518e5ed0dd.tar.xz
linux-2c0503f202f597325baae76e9f5686518e5ed0dd.zip
Merge branches 'pci/host-designware', 'pci/host-imx6' and 'pci/host-rcar' into next
* pci/host-designware: PCI: designware: Fix RC BAR to be single 64-bit non-prefetchable memory BAR * pci/host-imx6: PCI: imx6: Wait for retraining * pci/host-rcar: PCI: rcar: Make the Kconfig dependencies more generic PCI: rcar: Break out window size handling PCI: rcar: Register each instance independently PCI: rcar: Fix bridge logic configuration accesses PCI: rcar: Add error interrupt handling PCI: rcar: Check platform_get_irq() return code