Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / sb1250-mac.c

diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 132e2148b21c6d5095ef1bd498df470d7fbdc936..e7fdcf15b5a72f88cf9961843afca4cbab4a3ecc 100644 (file)
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -1159,7 +1159,7 @@ static void sbmac_netpoll(struct net_device *netdev)
 
        __raw_writeq(0, sc->sbm_imr);
 
-       sbmac_intr(irq, netdev, NULL);
+       sbmac_intr(irq, netdev);
 
 #ifdef CONFIG_SBMAC_COALESCE
        __raw_writeq(((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_TX_CH0) |