diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-22 17:54:47 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-22 17:54:47 -0700 |
commit | 7cf75262a4aafe1483349e897bf905e121314dff (patch) | |
tree | 9a11d432ff3add3204c4bc5a01b6d12c4df7e9d9 /drivers/net/mv643xx_eth.c | |
parent | c8f15686a4b3345e3e81e09cfe191df58bbedd45 (diff) | |
parent | b0e453902ad53580a77c2b1baddcc0b2d8ce8acc (diff) | |
download | op-kernel-dev-7cf75262a4aafe1483349e897bf905e121314dff.zip op-kernel-dev-7cf75262a4aafe1483349e897bf905e121314dff.tar.gz |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 83a877f..8a97a00 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -2112,7 +2112,7 @@ static void mv643xx_eth_netpoll(struct net_device *dev) mv643xx_eth_irq(dev->irq, dev); - wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT); + wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); } #endif |