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
/
sh
/
kernel
/
cpu
/
irq
/
ipr.c
diff --git
a/arch/sh/kernel/cpu/irq/ipr.c
b/arch/sh/kernel/cpu/irq/ipr.c
index
e55150e
..
0373b65
100644
(file)
--- a/
arch/sh/kernel/cpu/irq/ipr.c
+++ b/
arch/sh/kernel/cpu/irq/ipr.c
@@
-115,7
+115,7
@@
void make_ipr_irq(unsigned int irq, unsigned int addr, int pos, int priority)
ipr_data[irq].shift = pos*4; /* POSition (0-3) x 4 means shift */
ipr_data[irq].priority = priority;
- irq_desc[irq].
handler
= &ipr_irq_type;
+ irq_desc[irq].
chip
= &ipr_irq_type;
disable_ipr_irq(irq);
}