diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-15 16:26:15 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-15 16:26:15 -0400 |
| commit | 272e70c0ded509906b7469ea0d487725ef1c17b3 (patch) | |
| tree | fe14da14dffbe51dc689f9bac3e6e85c145a08bf /include/linux/pci.h | |
| parent | 833260631178aa26c70a0b05eabc953f5e47167d (diff) | |
| parent | 9a97cd43f4ef62520a852b5a2348233b0f37455b (diff) | |
Merge branch 'pci/gabor-get-of-node' into next
* pci/gabor-get-of-node:
MIPS/PCI: Implement pcibios_get_phb_of_node
PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 849a336e149c..bcd976976c3e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -1838,7 +1838,7 @@ extern void pci_set_bus_of_node(struct pci_bus *bus); | |||
| 1838 | extern void pci_release_bus_of_node(struct pci_bus *bus); | 1838 | extern void pci_release_bus_of_node(struct pci_bus *bus); |
| 1839 | 1839 | ||
| 1840 | /* Arch may override this (weak) */ | 1840 | /* Arch may override this (weak) */ |
| 1841 | extern struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus); | 1841 | extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus); |
| 1842 | 1842 | ||
| 1843 | static inline struct device_node * | 1843 | static inline struct device_node * |
| 1844 | pci_device_to_OF_node(const struct pci_dev *pdev) | 1844 | pci_device_to_OF_node(const struct pci_dev *pdev) |