aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/via-maciisi.c
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-10-07 14:16:45 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-07 10:51:14 -0700
commit2850bc273776cbb1b510c5828e9e456dffb50a32 (patch)
tree340bd599b6efde40618ef89de59cbe957269eac2 /drivers/macintosh/via-maciisi.c
parent00079e04fe478cd3c59ae2106ef2fbe779e67024 (diff)
downloadkernel_samsung_smdk4412-2850bc273776cbb1b510c5828e9e456dffb50a32.zip
kernel_samsung_smdk4412-2850bc273776cbb1b510c5828e9e456dffb50a32.tar.gz
kernel_samsung_smdk4412-2850bc273776cbb1b510c5828e9e456dffb50a32.tar.bz2
[PATCH] m68k pt_regs fixes
m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/macintosh/via-maciisi.c')
-rw-r--r--drivers/macintosh/via-maciisi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index 789ee52..1f0aa5d 100644
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -421,7 +421,7 @@ maciisi_poll(void)
local_irq_save(flags);
if (via[IFR] & SR_INT) {
- maciisi_interrupt(0, NULL, NULL);
+ maciisi_interrupt(0, NULL);
}
else /* avoid calling this function too quickly in a loop */
udelay(ADB_DELAY);