git.kernelconcepts.de Git - karo-tx-linux.git/commit

Merge branch 'pci/dead-code' into next

* pci/dead-code:
  PCI: Make local functions static
  PCI: Remove unused alloc_pci_dev()
  PCI: Remove unused pci_renumber_slot()
  PCI: Remove unused pcie_aspm_enabled()
  PCI: Remove unused pci_vpd_truncate()
  PCI: Remove unused ID-Based Ordering support
  PCI: Remove unused Optimized Buffer Flush/Fill support
  PCI: Remove unused Latency Tolerance Reporting support
  PCI: Removed unused parts of Page Request Interface support

Conflicts:
drivers/pci/pci.c
include/linux/pci.h

author	Bjorn Helgaas <bhelgaas@google.com>
	Mon, 13 Jan 2014 23:47:08 +0000 (16:47 -0700)
committer	Bjorn Helgaas <bhelgaas@google.com>
	Mon, 13 Jan 2014 23:47:08 +0000 (16:47 -0700)
commit	597db6f38c4bcb90406d4e2f56446ba5a5dc20c6
tree	82cb8a6e1cec2df8adaf527b92667a4c5ba29254	tree \| snapshot
parent	6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2	commit \| diff
parent	0b950f0f3c67e42f18c655a3ab3e36ea192635bb	commit \| diff

drivers/pci/hotplug/pciehp.h	diff1 \|	diff2 \|	blob \| history
drivers/pci/hotplug/pciehp_core.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/probe.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history