git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-iop32x
/
irq.c
diff --git
a/arch/arm/mach-iop32x/irq.c
b/arch/arm/mach-iop32x/irq.c
index d3426a120599e95617e8c82b954208244184ad09..d7ee2789d890a19b1db52f3015db818188de4c78 100644
(file)
--- a/
arch/arm/mach-iop32x/irq.c
+++ b/
arch/arm/mach-iop32x/irq.c
@@
-68,8
+68,7
@@
void __init iop32x_init_irq(void)
*IOP3XX_PCIIRSR = 0x0f;
for (i = 0; i < NR_IRQS; i++) {
- set_irq_chip(i, &ext_chip);
- set_irq_handler(i, handle_level_irq);
+ irq_set_chip_and_handler(i, &ext_chip, handle_level_irq);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}