]> err.no Git - linux-2.6/commitdiff
mv643xx_eth: fix NETPOLL build
authorLennert Buytenhek <buytenh@wantstofly.org>
Sun, 6 Jul 2008 22:03:00 +0000 (00:03 +0200)
committerJeff Garzik <jgarzik@redhat.com>
Tue, 22 Jul 2008 23:56:37 +0000 (19:56 -0400)
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>
drivers/net/mv643xx_eth.c

index 83a877f3a553ee94611dced9e87d28f2222aecaf..8a97a0066a886d5bae454fb7c703900c13dc2326 100644 (file)
@@ -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