diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/gianfar.c | |
| parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
| parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 587afe7be689..642dc633b444 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -925,7 +925,7 @@ rx_irq_fail: | |||
| 925 | tx_irq_fail: | 925 | tx_irq_fail: |
| 926 | free_irq(priv->interruptError, dev); | 926 | free_irq(priv->interruptError, dev); |
| 927 | err_irq_fail: | 927 | err_irq_fail: |
| 928 | err_rxalloc_fail: | 928 | err_rxalloc_fail: |
| 929 | rx_skb_fail: | 929 | rx_skb_fail: |
| 930 | free_skb_resources(priv); | 930 | free_skb_resources(priv); |
| 931 | tx_skb_fail: | 931 | tx_skb_fail: |