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

diff --cc drivers/pci/hotplug/pciehp.h
Simple merge

diff --cc drivers/pci/hotplug/pciehp_core.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc include/linux/pci.h
index f7d1dcc002fa6ef145efd6369581c6bb12c62567,fd440ccd431b8750d8611a9c20a1b5fe389a2893..eba7764b1586ee345fdf0bd989567532f9ca5b54
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -974,15 -969,8 +970,14 @@@ void __iomem __must_check *pci_platform
  int pci_save_state(struct pci_dev *dev);
  void pci_restore_state(struct pci_dev *dev);
  struct pci_saved_state *pci_store_saved_state(struct pci_dev *dev);
- int pci_load_saved_state(struct pci_dev *dev, struct pci_saved_state *state);
  int pci_load_and_free_saved_state(struct pci_dev *dev,
                                  struct pci_saved_state **state);
 +struct pci_cap_saved_state *pci_find_saved_cap(struct pci_dev *dev, char cap);
 +struct pci_cap_saved_state *pci_find_saved_ext_cap(struct pci_dev *dev,
 +                                                 u16 cap);
 +int pci_add_cap_save_buffer(struct pci_dev *dev, char cap, unsigned int size);
 +int pci_add_ext_cap_save_buffer(struct pci_dev *dev,
 +                              u16 cap, unsigned int size);
  int __pci_complete_power_transition(struct pci_dev *dev, pci_power_t state);
  int pci_set_power_state(struct pci_dev *dev, pci_power_t state);
  pci_power_t pci_choose_state(struct pci_dev *dev, pm_message_t state);
@@@ -1004,27 -991,6 +998,11 @@@ static inline int pci_enable_wake(struc
        return __pci_enable_wake(dev, state, false, enable);
  }
  
- #define PCI_EXP_IDO_REQUEST   (1<<0)
- #define PCI_EXP_IDO_COMPLETION        (1<<1)
- void pci_enable_ido(struct pci_dev *dev, unsigned long type);
- void pci_disable_ido(struct pci_dev *dev, unsigned long type);
- 
- enum pci_obff_signal_type {
-       PCI_EXP_OBFF_SIGNAL_L0 = 0,
-       PCI_EXP_OBFF_SIGNAL_ALWAYS = 1,
- };
- int pci_enable_obff(struct pci_dev *dev, enum pci_obff_signal_type);
- void pci_disable_obff(struct pci_dev *dev);
- 
- int pci_enable_ltr(struct pci_dev *dev);
- void pci_disable_ltr(struct pci_dev *dev);
- int pci_set_ltr(struct pci_dev *dev, int snoop_lat_ns, int nosnoop_lat_ns);
- 
 +/* PCI Virtual Channel */
 +int pci_save_vc_state(struct pci_dev *dev);
 +void pci_restore_vc_state(struct pci_dev *dev);
 +void pci_allocate_vc_save_buffers(struct pci_dev *dev);
 +
  /* For use by arch with custom probe code */
  void set_pcie_port_type(struct pci_dev *pdev);
  void set_pcie_hotplug_bridge(struct pci_dev *pdev);