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);
 		}