diff --git a/[refs] b/[refs]
index 7d2f3b41a5da..4db6a0250778 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af768c6711de615abf9c679732a2f8245a4c286c
+refs/heads/master: 315917d23fdd20a0f4ff99b9228de5840d9d276c
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index 27f90b2139c0..b977ed85ff39 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -1473,8 +1473,8 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	struct rtl8169_private *tp;
 	struct net_device *dev;
 	void __iomem *ioaddr;
-	unsigned int i, pm_cap;
-	int rc;
+	unsigned int pm_cap;
+	int i, rc;
 
 	if (netif_msg_drv(&debug)) {
 		printk(KERN_INFO "%s Gigabit Ethernet driver %s loaded\n",