summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-02-07 17:22:24 +0300
committerBjorn Helgaas <bhelgaas@google.com>2015-02-07 17:22:24 +0300
commitcb8e92d8e4d9f8562071b6ab39e1b837e9e7af39 (patch)
treed9cc510c0d6c396d803cd10bf56b681072084c41 /include
parent66e5bde9e5f9a4007be107c2926f96ec9b2b0010 (diff)
parentf0b66a2cf68ed3613fe72fe01ed309f998e2bbb3 (diff)
downloadlinux-cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39.tar.xz
Merge branch 'pci/misc' into next
* pci/misc: PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 10028a94eeb3..3f835a049d6a 100644
--- 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