diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-07 16:29:18 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 10:51:15 -0700 |
| commit | 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 (patch) | |
| tree | 2ee465eedaec181e1eb8f50acbc0f86c03325a32 /drivers | |
| parent | 8774cb815f2492a95b90a927f93a2de555753b32 (diff) | |
| download | op-kernel-dev-9c8e7f5cc965d30006c917ab19221e06fcc5a4f9.zip op-kernel-dev-9c8e7f5cc965d30006c917ab19221e06fcc5a4f9.tar.gz | |
[PATCH] m32r pt_regs fixes
... and now with irq_regs.h not forgotten...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/smc91x.c | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/m32r_pcc.c | 2 | ||||
| -rw-r--r-- | drivers/serial/m32r_sio.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 506807f..95b6478 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -1400,7 +1400,7 @@ static irqreturn_t smc_interrupt(int irq, void *dev_id) static void smc_poll_controller(struct net_device *dev) { disable_irq(dev->irq); - smc_interrupt(dev->irq, dev, NULL); + smc_interrupt(dev->irq, dev); enable_irq(dev->irq); } #endif diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 0964fd7..bbf0258 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c @@ -395,7 +395,7 @@ static irqreturn_t pcc_interrupt(int irq, void *dev) static void pcc_interrupt_wrapper(u_long data) { - pcc_interrupt(0, NULL, NULL); + pcc_interrupt(0, NULL); init_timer(&poll_timer); poll_timer.expires = jiffies + poll_interval; add_timer(&poll_timer); diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index c85ac1a..7656a35 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c @@ -590,7 +590,7 @@ static void m32r_sio_timeout(unsigned long data) sts = sio_in(up, SIOSTS); if (sts & 0x5) { spin_lock(&up->port.lock); - m32r_sio_handle_port(up, sts, NULL); + m32r_sio_handle_port(up, sts); spin_unlock(&up->port.lock); } |
