From 7a0dece87ead925880f6e90ef76772951f998c9e Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Fri, 12 Feb 2010 06:57:58 +0000
Subject: [PATCH] --- yaml --- r: 184031 b: refs/heads/master c:
 8b05543129a5f216e08625e947a16b844bc4766d h: refs/heads/master i:   184029:
 78bf3b041e3545d8520568c4b6892612e8d8d076   184027:
 b217a95adf2294d77a19c2e4a5f1ad9487f4b75f   184023:
 77337d2e3266003ab08dbe48ed5aab9aa33e03e8   184015:
 9bf085bb3006df872ab0ce07d66eea035f06c396   183999:
 2968f9484c2f0523e4498d68c12d8d955e3a7da3 v: v3

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

diff --git a/[refs] b/[refs]
index 22d7303b8db8..6fc1061c4be7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a63374631e7192a64648ecc6672619a7abf9ebcd
+refs/heads/master: 8b05543129a5f216e08625e947a16b844bc4766d
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 45299d663498..92f7ba0953ee 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -3128,7 +3128,7 @@ static void sky2_reset(struct sky2_hw *hw)
 		/* check if PSMv2 was running before */
 		reg = sky2_pci_read16(hw, PSM_CONFIG_REG3);
 		if (reg & PCI_EXP_LNKCTL_ASPMC) {
-			int cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+			cap = pci_find_capability(pdev, PCI_CAP_ID_EXP);
 			/* restore the PCIe Link Control register */
 			sky2_pci_write16(hw, cap + PCI_EXP_LNKCTL, reg);
 		}