Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
This commit is contained in:
Bjorn Helgaas 2015-02-07 08:22:24 -06:00
commit cb8e92d8e4

View file

@ -1862,6 +1862,8 @@ static inline void pci_set_of_node(struct pci_dev *dev) { }
static inline void pci_release_of_node(struct pci_dev *dev) { } static inline void pci_release_of_node(struct pci_dev *dev) { }
static inline void pci_set_bus_of_node(struct pci_bus *bus) { } static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
static inline void pci_release_bus_of_node(struct pci_bus *bus) { } static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
static inline struct device_node *
pci_device_to_OF_node(const struct pci_dev *pdev) { return NULL; }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
#ifdef CONFIG_EEH #ifdef CONFIG_EEH