diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-07-06 18:03:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-22 19:56:37 -0400 |
| commit | f2ca60f2067958e45f949e74abd580715c6c4b33 (patch) | |
| tree | 638707f6dab83127d01bb716bfaa7d77ff056f2e /drivers/net | |
| parent | 3d4634193aa95a6d04a786fc12b190d0e4295685 (diff) | |
mv643xx_eth: fix NETPOLL build
Joseph Fannin <jfannin@gmail.com> and Takashi Iwai <tiwai@suse.de>
noticed that commit 073a345c04b01da0cc5b79ac7be0c7c8b1691ef5
("mv643xx_eth: clarify irq masking and unmasking") broke the
mv643xx_eth build when NETPOLL is enabled, due to it not renaming
one instance of INT_CAUSE_EXT in mv643xx_eth_netpoll(). This patch
takes care of that instance as well.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Cc: Dale Farnsworth <dale@farnsworth.org>
Cc: Joseph Fannin <jfannin@gmail.com>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
| -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 | ||