summaryrefslogtreecommitdiff
path: root/drivers/pci/host/Makefile
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-09-05 10:57:20 -0600
committerBjorn Helgaas <bhelgaas@google.com>2014-09-05 10:57:20 -0600
commita2351efeb3b4e11a97117e048027a9d09855d309 (patch)
treea9e4da25a56f3df71135bacf088300da4e7d1d09 /drivers/pci/host/Makefile
parent52addcf9d6669fa439387610bc65c92fa0980cef (diff)
parentefd01a72e7ec99ed583151fbf16b176cd2158967 (diff)
parent385321e2c65a5c4812ef64f46c248c9b8ef66b90 (diff)
parent84a263f39403ca3b399af77499876e02e634b00b (diff)
parent61da50da903fdfc00b40f3b3e3abeca7ae51b591 (diff)
parent0c4ffcfe1fbc1ef564ec137eab21137cb013b00e (diff)
parent41534e53786df49b708c1e06f5d6ef9b53fbb689 (diff)
parent8961def56845593f22ce85474e428f6e4892fdd3 (diff)
Merge branches 'pci/misc', 'pci/pm', 'pci/host-designware', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-tegra' and 'pci/host-xilinx' into next
* pci/misc: PCI/AER: Make <linux/aer.h> standalone includable PCI: Remove unnecessary variable in pci_add_dynid() * pci/pm: PCI/PM: Allow PCI devices to be put into D3cold during system suspend PCI/PM: Drop unused runtime PM support code for PCIe ports * pci/host-designware: PCI: designware: Check private_data validity in single place PCI: designware: Remove pci_assign_unassigned_resources() from dw_pcie_host_init() PCI: designware: Use pci_create_root_bus() instead of pci_scan_root_bus() PCI: designware: Parse bus-range property from devicetree PCI: designware: Add support for v3.65 hardware * pci/host-imx6: PCI: imx6: Probe in module_init(), not fs_initcall() PCI: designware: Remove pci_assign_unassigned_resources() from dw_pcie_host_init() PCI: designware: Use pci_create_root_bus() instead of pci_scan_root_bus() PCI: designware: Parse bus-range property from devicetree PCI: imx6: Put LTSSM in "Detect" state before disabling it MAINTAINERS: Add Lucas Stach as co-maintainer for i.MX6 PCI driver PCI: designware: Add support for v3.65 hardware * pci/host-keystone: PCI: keystone: Add TI Keystone PCIe driver PCI: designware: Add support for v3.65 hardware * pci/host-tegra: PCI: tegra: Implement a proper resource hierarchy PCI: tegra: Add missing cleanup in error path and tegra_msi_teardown_irq() resources: Add device-managed request/release_resource() * pci/host-xilinx: PCI: xilinx: Add Xilinx AXI PCIe Host Bridge IP driver Conflicts: drivers/pci/host/Kconfig drivers/pci/host/Makefile