diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-12 15:07:03 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-08-12 15:07:03 -0600 |
| commit | 63ef41811b86432101b4627ff07c9671f93a483f (patch) | |
| tree | dc34a1b936e6e859d9ab514fc255955acaa2e85f /include/linux/pci.h | |
| parent | df99d6a4e9a334a90980d752608ddf5a5fb59719 (diff) | |
| parent | 4d708ab0c88512a3bea12f1ad68539fbe0d11d1a (diff) | |
| download | op-kernel-dev-63ef41811b86432101b4627ff07c9671f93a483f.zip op-kernel-dev-63ef41811b86432101b4627ff07c9671f93a483f.tar.gz | |
Merge branch 'pci/vipul-chelsio-reset-v2' into next
* pci/vipul-chelsio-reset-v2:
PCI: Use pci_wait_for_pending_transaction() instead of for loop
bnx2x: Use pci_wait_for_pending_transaction() instead of for loop
PCI: Chelsio quirk: Enable Bus Master during Function-Level Reset
PCI: Add pci_wait_for_pending_transaction()
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 0fd1f15..e647001 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -914,6 +914,7 @@ bool pci_check_and_unmask_intx(struct pci_dev *dev); void pci_msi_off(struct pci_dev *dev); int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); +int pci_wait_for_pending_transaction(struct pci_dev *dev); int pcix_get_max_mmrbc(struct pci_dev *dev); int pcix_get_mmrbc(struct pci_dev *dev); int pcix_set_mmrbc(struct pci_dev *dev, int mmrbc); |
