diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /drivers/net/gianfar.c | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 16def131c390..6850dc0a7b91 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -2644,6 +2644,7 @@ static void gfar_netpoll(struct net_device *dev) | |||
| 2644 | gfar_interrupt(priv->gfargrp[i].interruptTransmit, | 2644 | gfar_interrupt(priv->gfargrp[i].interruptTransmit, |
| 2645 | &priv->gfargrp[i]); | 2645 | &priv->gfargrp[i]); |
| 2646 | enable_irq(priv->gfargrp[i].interruptTransmit); | 2646 | enable_irq(priv->gfargrp[i].interruptTransmit); |
| 2647 | } | ||
| 2647 | } | 2648 | } |
| 2648 | } | 2649 | } |
| 2649 | #endif | 2650 | #endif |