From 61c1606e4e8004cdddf98fb9275d1284ea8aec13 Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@kudzu.us>
Date: Tue, 10 Jul 2012 14:57:55 -0700
Subject: [PATCH] --- yaml --- r: 316836 b: refs/heads/master c:
 983bfb5b40157c9fbb7c5290508f18845b7e7234 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 18c6e66f7dfa..bfb70934cf78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94c122ab01f84332c371dc4ae0f5b70e879173d6
+refs/heads/master: 983bfb5b40157c9fbb7c5290508f18845b7e7234
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_nx.c b/trunk/drivers/scsi/qla4xxx/ql4_nx.c
index 228b67020d2c..939d7261c37a 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1590,7 +1590,7 @@ qla4_8xxx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
 	}
 
 	/* Negotiated Link width */
-	pcie_cap = pci_find_capability(ha->pdev, PCI_CAP_ID_EXP);
+	pcie_cap = pci_pcie_cap(ha->pdev);
 	pci_read_config_word(ha->pdev, pcie_cap + PCI_EXP_LNKSTA, &lnk);
 	ha->link_width = (lnk >> 4) & 0x3f;