diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-07-22 00:16:54 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-07-22 00:16:54 +0200 |
| commit | 8294fafdafc602ed11f401c44628fab8558c5cf5 (patch) | |
| tree | c8d0371cfd05226b56d52bfde9c69f8caca4501d /drivers/net/sis900.c | |
| parent | 725c3a2d70f958adee807c178178819a50f68a56 (diff) | |
| parent | bf20e740a4bcc686de02e2fd1c1810a58872f46e (diff) | |
Merge branch 'for-upstream/acpi-test' of git://repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6 into release-2.6.27
Diffstat (limited to 'drivers/net/sis900.c')
| -rw-r--r-- | drivers/net/sis900.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index ec95e493ac1..fa3a460f8e2 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c @@ -1766,7 +1766,7 @@ static int sis900_rx(struct net_device *net_dev) skb = sis_priv->rx_skbuff[entry]; net_dev->stats.rx_dropped++; goto refill_rx_ring; - } + } /* This situation should never happen, but due to some unknow bugs, it is possible that |