From 1b6eee4bab523b6bd9fbbc2ee3cf01b494fc564f Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 8 Oct 2006 15:00:44 +0100 Subject: [PATCH] --- yaml --- r: 39133 b: refs/heads/master c: 9da3b1ad7b074effd56729f9fc01cc5abf6503cc h: refs/heads/master i: 39131: 8b7a495a419e1941cae0fb8b4df550dc71dd8355 v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/macio-adb.c | 2 +- trunk/drivers/net/mv643xx_eth.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fb39baf4dbdb..3e110f8a62cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 28431146993e0ab3a2a592af8541543fe0cc2c8e +refs/heads/master: 9da3b1ad7b074effd56729f9fc01cc5abf6503cc diff --git a/trunk/drivers/macintosh/macio-adb.c b/trunk/drivers/macintosh/macio-adb.c index 57ccc19cbdbf..797cef72258f 100644 --- a/trunk/drivers/macintosh/macio-adb.c +++ b/trunk/drivers/macintosh/macio-adb.c @@ -270,6 +270,6 @@ static void macio_adb_poll(void) local_irq_save(flags); if (in_8(&adb->intr.r) != 0) - macio_adb_interrupt(0, NULL, NULL); + macio_adb_interrupt(0, NULL); local_irq_restore(flags); } diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index d26a819a9735..2ffa3a59e704 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/drivers/net/mv643xx_eth.c @@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev) /* wait for previous write to complete */ mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); - mv643xx_eth_int_handler(netdev->irq, netdev, NULL); + mv643xx_eth_int_handler(netdev->irq, netdev); mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); }