diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-22 02:32:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-22 02:32:24 -0400 |
| commit | d3c6e7ad09cebbad1a3dea077668062136626fd2 (patch) | |
| tree | 698022508a8d8c76a5d2cf55e50232079d6b1f42 /drivers/net/ll_temac_main.c | |
| parent | c3227e546c574172e77616270a16a04eae561b8f (diff) | |
| parent | 48d3ff82698cb0094684aed70446e0a5cbb1a4d0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/ll_temac_main.c')
| -rw-r--r-- | drivers/net/ll_temac_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index c7b624711f5e..bdf2149e5296 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
| @@ -902,8 +902,8 @@ temac_poll_controller(struct net_device *ndev) | |||
| 902 | disable_irq(lp->tx_irq); | 902 | disable_irq(lp->tx_irq); |
| 903 | disable_irq(lp->rx_irq); | 903 | disable_irq(lp->rx_irq); |
| 904 | 904 | ||
| 905 | ll_temac_rx_irq(lp->tx_irq, lp); | 905 | ll_temac_rx_irq(lp->tx_irq, ndev); |
| 906 | ll_temac_tx_irq(lp->rx_irq, lp); | 906 | ll_temac_tx_irq(lp->rx_irq, ndev); |
| 907 | 907 | ||
| 908 | enable_irq(lp->tx_irq); | 908 | enable_irq(lp->tx_irq); |
| 909 | enable_irq(lp->rx_irq); | 909 | enable_irq(lp->rx_irq); |