diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-08 10:00:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-08 15:32:36 -0400 |
commit | 9da3b1ad7b074effd56729f9fc01cc5abf6503cc (patch) | |
tree | 3baee72cc871c647f7e2ee84d6599ad185a0c482 | |
parent | 28431146993e0ab3a2a592af8541543fe0cc2c8e (diff) |
[PATCH] misc ppc pt_regs fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/macintosh/macio-adb.c | 2 | ||||
-rw-r--r-- | drivers/net/mv643xx_eth.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c index 57ccc19cbdbf..797cef72258f 100644 --- a/drivers/macintosh/macio-adb.c +++ b/drivers/macintosh/macio-adb.c | |||
@@ -270,6 +270,6 @@ static void macio_adb_poll(void) | |||
270 | 270 | ||
271 | local_irq_save(flags); | 271 | local_irq_save(flags); |
272 | if (in_8(&adb->intr.r) != 0) | 272 | if (in_8(&adb->intr.r) != 0) |
273 | macio_adb_interrupt(0, NULL, NULL); | 273 | macio_adb_interrupt(0, NULL); |
274 | local_irq_restore(flags); | 274 | local_irq_restore(flags); |
275 | } | 275 | } |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index d26a819a9735..2ffa3a59e704 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -1251,7 +1251,7 @@ static void mv643xx_netpoll(struct net_device *netdev) | |||
1251 | /* wait for previous write to complete */ | 1251 | /* wait for previous write to complete */ |
1252 | mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); | 1252 | mv_read(MV643XX_ETH_INTERRUPT_MASK_REG(port_num)); |
1253 | 1253 | ||
1254 | mv643xx_eth_int_handler(netdev->irq, netdev, NULL); | 1254 | mv643xx_eth_int_handler(netdev->irq, netdev); |
1255 | 1255 | ||
1256 | mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); | 1256 | mv_write(MV643XX_ETH_INTERRUPT_MASK_REG(port_num), ETH_INT_UNMASK_ALL); |
1257 | } | 1257 | } |