From: David S. Miller <davem@davemloft.net>
Date: Fri, 11 Jun 2010 20:32:31 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: MMI-PSA29.97-13-9~23092^2~607
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62522d36d74a843e78d17f2dffc90468c6762803;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6
---

62522d36d74a843e78d17f2dffc90468c6762803
diff --cc drivers/net/8139too.c
index cc7d46238801,97d8068b372b..f5166dccd8df
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@@ -860,8 -860,9 +860,9 @@@ retry
  		}
  
  	/* if unknown chip, assume array element #0, original RTL-8139 in this case */
+ 	i = 0;
  	dev_dbg(&pdev->dev, "unknown chip version, assuming RTL-8139\n");
 -	dev_dbg(&pdev->dev, "TxConfig = 0x%lx\n", RTL_R32 (TxConfig));
 +	dev_dbg(&pdev->dev, "TxConfig = 0x%x\n", RTL_R32 (TxConfig));
  	tp->chipset = 0;
  
  match: