Merge branch 'pci/misc' into next

* pci/misc: PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
mariux64 · Feb 7, 2015 · cb8e92d · cb8e92d
2 parents 66e5bde + f0b66a2
commit cb8e92d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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