---

yaml --- r: 39133 b: refs/heads/master c: 9da3b1a h: refs/heads/master i: 39131: 8b7a495 v: v3
git-mirror · Oct 8, 2006 · 1b6eee4 · 1b6eee4
1 parent 5628e5b
commit 1b6eee4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);
 }