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 branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-orion
/
irq.c
diff --git
a/arch/arm/plat-orion/irq.c
b/arch/arm/plat-orion/irq.c
index
f533bde
..
d8d638e
100644
(file)
--- a/
arch/arm/plat-orion/irq.c
+++ b/
arch/arm/plat-orion/irq.c
@@
-56,8
+56,8
@@
void __init orion_irq_init(unsigned int irq_start, void __iomem *maskaddr)
for (i = 0; i < 32; i++) {
unsigned int irq = irq_start + i;
for (i = 0; i < 32; i++) {
unsigned int irq = irq_start + i;
- irq_set_chip
(irq, &orion_irq_chip);
-
irq_set_handler(irq,
handle_level_irq);
+ irq_set_chip
_and_handler(irq, &orion_irq_chip,
+
handle_level_irq);
irq_set_chip_data(irq, maskaddr);
irq_set_status_flags(irq, IRQ_LEVEL);
set_irq_flags(irq, IRQF_VALID);
irq_set_chip_data(irq, maskaddr);
irq_set_status_flags(irq, IRQ_LEVEL);
set_irq_flags(irq, IRQF_VALID);