From b2b7c4a0e8577da09ac0e48eca92d3dd3e196cef Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Wed, 29 Nov 2006 22:21:33 +0100 Subject: [PATCH] --- yaml --- r: 41145 b: refs/heads/master c: 315917d23fdd20a0f4ff99b9228de5840d9d276c h: refs/heads/master i: 41143: 3210fa418109819e966fe9706af1169532660647 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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",