git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
irq.c
diff --git
a/arch/m32r/kernel/irq.c
b/arch/m32r/kernel/irq.c
index
f745c12
..
76eaf38
100644
(file)
--- a/
arch/m32r/kernel/irq.c
+++ b/
arch/m32r/kernel/irq.c
@@
-80,7
+80,7
@@
asmlinkage unsigned int do_IRQ(int irq, struct pt_regs *regs)
#ifdef CONFIG_DEBUG_STACKOVERFLOW
/* FIXME M32R */
#endif
-
__do_IRQ
(irq);
+
generic_handle_irq
(irq);
irq_exit();
set_irq_regs(old_regs);