diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-13 16:47:08 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-13 16:47:08 -0700 |
commit | 597db6f38c4bcb90406d4e2f56446ba5a5dc20c6 (patch) | |
tree | 82cb8a6e1cec2df8adaf527b92667a4c5ba29254 /drivers/pci/pci.h | |
parent | 6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2 (diff) | |
parent | 0b950f0f3c67e42f18c655a3ab3e36ea192635bb (diff) | |
download | linux-597db6f38c4bcb90406d4e2f56446ba5a5dc20c6.tar.gz linux-597db6f38c4bcb90406d4e2f56446ba5a5dc20c6.tar.bz2 linux-597db6f38c4bcb90406d4e2f56446ba5a5dc20c6.zip |
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
Diffstat (limited to 'drivers/pci/pci.h')
-rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 9c91ecc1301b..4df38df224f4 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -6,7 +6,6 @@ #define PCI_CFG_SPACE_SIZE 256 #define PCI_CFG_SPACE_EXP_SIZE 4096 -extern const unsigned char pcix_bus_speed[]; extern const unsigned char pcie_link_speed[]; /* Functions internal to the PCI core code */ @@ -68,7 +67,6 @@ void pci_power_up(struct pci_dev *dev); void pci_disable_enabled_device(struct pci_dev *dev); int pci_finish_runtime_suspend(struct pci_dev *dev); int __pci_pme_wakeup(struct pci_dev *dev, void *ign); -void pci_wakeup_bus(struct pci_bus *bus); void pci_config_pm_runtime_get(struct pci_dev *dev); void pci_config_pm_runtime_put(struct pci_dev *dev); void pci_pm_init(struct pci_dev *dev); |