diff options
author | Bjorn Helgaas | 2015-02-07 15:22:24 +0100 |
---|---|---|
committer | Bjorn Helgaas | 2015-02-07 15:22:24 +0100 |
commit | cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39 (patch) | |
tree | d9cc510c0d6c396d803cd10bf56b681072084c41 /include/linux/pci.h | |
parent | Merge branches 'pci/misc' and 'pci/msi' into next (diff) | |
parent | PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF (diff) | |
download | kernel-qcow2-linux-cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39.tar.gz kernel-qcow2-linux-cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39.tar.xz kernel-qcow2-linux-cb8e92d8e4d9f8562071b6ab39e1b837e9e7af39.zip |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Add pci_device_to_OF_node() stub for !CONFIG_OF
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 2 |
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 |