git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
mthca
/
mthca_reset.c
diff --git
a/drivers/infiniband/hw/mthca/mthca_reset.c
b/drivers/infiniband/hw/mthca/mthca_reset.c
index
2a13a16
..
4fa3534
100644
(file)
--- a/
drivers/infiniband/hw/mthca/mthca_reset.c
+++ b/
drivers/infiniband/hw/mthca/mthca_reset.c
@@
-113,7
+113,7
@@
int mthca_reset(struct mthca_dev *mdev)
}
hca_pcix_cap = pci_find_capability(mdev->pdev, PCI_CAP_ID_PCIX);
- hca_pcie_cap = pci_
find_capability(mdev->pdev, PCI_CAP_ID_EXP
);
+ hca_pcie_cap = pci_
pcie_cap(mdev->pdev
);
if (bridge) {
bridge_header = kmalloc(256, GFP_KERNEL);