diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 13:10:23 -0400 |
| commit | a4e0d9af403d099e751797f6cc69e4a8e2d78ef1 (patch) | |
| tree | 6f4afdffe5dbaad7529be987b8c3259a07395031 /drivers/net/mv643xx_eth.c | |
| parent | c60f2b5c1defb6b1345968e1c65c2008c221d57d (diff) | |
| parent | c010b2f76c3032e48097a6eef291d8593d5d79a6 (diff) | |
Merge ../linux-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 83a877f3a553..8a97a0066a88 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) | |||
| 2112 | 2112 | ||
| 2113 | mv643xx_eth_irq(dev->irq, dev); | 2113 | mv643xx_eth_irq(dev->irq, dev); |
| 2114 | 2114 | ||
| 2115 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_CAUSE_EXT); | 2115 | wrl(mp, INT_MASK(mp->port_num), INT_TX_END | INT_RX | INT_EXT); |
| 2116 | } | 2116 | } |
| 2117 | #endif | 2117 | #endif |
| 2118 | 2118 | ||