diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 17:04:51 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-06-13 17:04:51 -0600 |
| commit | 10c480933d0ad2ea27630cbaa723a5d33dbece00 (patch) | |
| tree | 6938c675ca99e1204d701b4fb60af89d381beeff /include/linux/pci.h | |
| parent | a187177ae047e005a7b40229555837a529a9c2cc (diff) | |
| parent | 505cf30b7f4ef64c6db36f34adbe4a7ad9081fd3 (diff) | |
Merge branch 'topic/bjorn-remove-unused' into next
* topic/bjorn-remove-unused:
PCI/AER: use pci_is_pcie() instead of obsolete pci_dev.is_pcie
PCI: remove pci_max_busnr() (was already commented out)
PCI: remove pci_bus_find_ext_capability() (unused)
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 8c8b44d62105..27da5ce46282 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -718,8 +718,6 @@ enum pci_lost_interrupt_reason pci_lost_interrupt(struct pci_dev *dev); int pci_find_capability(struct pci_dev *dev, int cap); int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap); int pci_find_ext_capability(struct pci_dev *dev, int cap); -int pci_bus_find_ext_capability(struct pci_bus *bus, unsigned int devfn, - int cap); int pci_find_ht_capability(struct pci_dev *dev, int ht_cap); int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap); struct pci_bus *pci_find_next_bus(const struct pci_bus *from); |