diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 20:32:36 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-23 20:32:36 -0400 |
| commit | a28afda8cc6a45b2c5a4f98cf8fcddd877597701 (patch) | |
| tree | 2ad4d76e22ddb294fcf31d06b79e7464c70c653a /include/linux/pci.h | |
| parent | e1c171b86baaccab983ded5dfa1663c0981d2520 (diff) | |
| parent | defb9446fe417f72855bc8bf97aa5d8af076bdf8 (diff) | |
Merge branch 'pci/bjorn-find-next-ext-cap' into next
* pci/bjorn-find-next-ext-cap:
PCI: Add Vendor-Specific Extended Capability header info
PCI: Add pci_find_next_ext_capability()
Conflicts:
drivers/pci/pci.c
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index b8667e0548e0..57a08da824e0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -755,6 +755,7 @@ enum pci_lost_interrupt_reason pci_lost_interrupt(struct pci_dev *dev); | |||
| 755 | int pci_find_capability(struct pci_dev *dev, int cap); | 755 | int pci_find_capability(struct pci_dev *dev, int cap); |
| 756 | int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap); | 756 | int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap); |
| 757 | int pci_find_ext_capability(struct pci_dev *dev, int cap); | 757 | int pci_find_ext_capability(struct pci_dev *dev, int cap); |
| 758 | int pci_find_next_ext_capability(struct pci_dev *dev, int pos, int cap); | ||
| 758 | int pci_find_ht_capability(struct pci_dev *dev, int ht_cap); | 759 | int pci_find_ht_capability(struct pci_dev *dev, int ht_cap); |
| 759 | int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap); | 760 | int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap); |
| 760 | struct pci_bus *pci_find_next_bus(const struct pci_bus *from); | 761 | struct pci_bus *pci_find_next_bus(const struct pci_bus *from); |