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 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop33x
/
irq.c
diff --git
a/arch/arm/mach-iop33x/irq.c
b/arch/arm/mach-iop33x/irq.c
index
0ff2f74
..
f7f5d3e
100644
(file)
--- a/
arch/arm/mach-iop33x/irq.c
+++ b/
arch/arm/mach-iop33x/irq.c
@@
-110,8
+110,9
@@
void __init iop33x_init_irq(void)
*IOP3XX_PCIIRSR = 0x0f;
for (i = 0; i < NR_IRQS; i++) {
*IOP3XX_PCIIRSR = 0x0f;
for (i = 0; i < NR_IRQS; i++) {
- set_irq_chip(i, (i < 32) ? &iop33x_irqchip1 : &iop33x_irqchip2);
- set_irq_handler(i, handle_level_irq);
+ irq_set_chip_and_handler(i,
+ (i < 32) ? &iop33x_irqchip1 : &iop33x_irqchip2,
+ handle_level_irq);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}