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 ../linus
[pandora-kernel.git]
/
arch
/
mips
/
sgi-ip32
/
ip32-irq.c
diff --git
a/arch/mips/sgi-ip32/ip32-irq.c
b/arch/mips/sgi-ip32/ip32-irq.c
index
8ba0804
..
00b94aa
100644
(file)
--- a/
arch/mips/sgi-ip32/ip32-irq.c
+++ b/
arch/mips/sgi-ip32/ip32-irq.c
@@
-591,7
+591,7
@@
void __init arch_init_irq(void)
irq_desc[irq].status = IRQ_DISABLED;
irq_desc[irq].action = 0;
irq_desc[irq].depth = 0;
- irq_desc[irq].
handler
= controller;
+ irq_desc[irq].
chip
= controller;
}
setup_irq(CRIME_MEMERR_IRQ, &memerr_irq);
setup_irq(CRIME_CPUERR_IRQ, &cpuerr_irq);