Skip to content

Commit

Permalink
[PATCH] misc ppc pt_regs fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 8, 2006
1 parent 2843114 commit 9da3b1a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/macintosh/macio-adb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
2 changes: 1 addition & 1 deletion drivers/net/mv643xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 9da3b1a

Please sign in to comment.