From 327fbfafc6e9f6967d15ecf79a46aac1d166d672 Mon Sep 17 00:00:00 2001
From: Jon Mason <jdmason@kudzu.us>
Date: Mon, 27 Jun 2011 07:44:43 +0000
Subject: [PATCH] --- yaml --- r: 255972 b: refs/heads/master c:
 e82760e7d6498d24d1a92f22767ba578c8980a6d h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/bnx2.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b7d2650a4316..fdcc932b46d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdaae04c65ef88645f50dabb43992033c754c4a7
+refs/heads/master: e82760e7d6498d24d1a92f22767ba578c8980a6d
diff --git a/trunk/drivers/net/bnx2.c b/trunk/drivers/net/bnx2.c
index 74580bb175f1..7915d1404572 100644
--- a/trunk/drivers/net/bnx2.c
+++ b/trunk/drivers/net/bnx2.c
@@ -7911,9 +7911,8 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev)
 	bp->chip_id = REG_RD(bp, BNX2_MISC_ID);
 
 	if (CHIP_NUM(bp) == CHIP_NUM_5709) {
-		if (pci_find_capability(pdev, PCI_CAP_ID_EXP) == 0) {
-			dev_err(&pdev->dev,
-				"Cannot find PCIE capability, aborting\n");
+		if (!pci_is_pcie(pdev)) {
+			dev_err(&pdev->dev, "Not PCIE, aborting\n");
 			rc = -EIO;
 			goto err_out_unmap;
 		}