diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 19:27:36 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-01-26 19:27:36 -0500 |
| commit | 14b5cb37cc6172a54ce920c61784f44422ae306d (patch) | |
| tree | 53e500c8aec98e645079e025c2525ce399052e1d /drivers/pci/pci.h | |
| parent | 708b59bfe1d1727451ca41f5dc4c17cf99dfaf51 (diff) | |
| parent | fcbed0bcb216b9f134e8614f46e00649a179e042 (diff) | |
Merge branch 'pci/yijing-ari' into next
* pci/yijing-ari:
PCI: shpchp: Iterate over all devices in slot, not functions 0-7
PCI: sgihp: Iterate over all devices in slot, not functions 0-7
PCI: cpcihp: Iterate over all devices in slot, not functions 0-7
PCI: pciehp: Iterate over all devices in slot, not functions 0-7
PCI: Consolidate "next-function" functions
PCI: Rename pci_enable_ari() to pci_configure_ari()
PCI: Enable ARI if dev and upstream bridge support it; disable otherwise
Diffstat (limited to 'drivers/pci/pci.h')
| -rw-r--r-- | drivers/pci/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index adfd172c5b9b..81b6a8752517 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h | |||
| @@ -204,7 +204,7 @@ extern int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | |||
| 204 | extern int pci_resource_bar(struct pci_dev *dev, int resno, | 204 | extern int pci_resource_bar(struct pci_dev *dev, int resno, |
| 205 | enum pci_bar_type *type); | 205 | enum pci_bar_type *type); |
| 206 | extern int pci_bus_add_child(struct pci_bus *bus); | 206 | extern int pci_bus_add_child(struct pci_bus *bus); |
| 207 | extern void pci_enable_ari(struct pci_dev *dev); | 207 | extern void pci_configure_ari(struct pci_dev *dev); |
| 208 | /** | 208 | /** |
| 209 | * pci_ari_enabled - query ARI forwarding status | 209 | * pci_ari_enabled - query ARI forwarding status |
| 210 | * @bus: the PCI bus | 210 | * @bus: the PCI bus |