Merge branch 'pci/misc' into next

* pci/misc: PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF

Merge branch 'pci/misc' into next
* pci/misc: PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
cb8e92d8 · Bjorn Helgaas · 66e5bde9 · f0b66a2c · cb8e92d8
Commit cb8e92d8 authored Feb 07, 2015 by Bjorn Helgaas
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/linux/pci.h include/linux/pci.h +2 -0

No files found.
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -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_set_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 */

 #ifdef CONFIG_EEH