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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-clps711x
/
irq.c
diff --git
a/arch/arm/mach-clps711x/irq.c
b/arch/arm/mach-clps711x/irq.c
index
86da7a1
..
c2eceee
100644
(file)
--- a/
arch/arm/mach-clps711x/irq.c
+++ b/
arch/arm/mach-clps711x/irq.c
@@
-112,13
+112,13
@@
void __init clps711x_init_irq(void)
for (i = 0; i < NR_IRQS; i++) {
if (INT1_IRQS & (1 << i)) {
for (i = 0; i < NR_IRQS; i++) {
if (INT1_IRQS & (1 << i)) {
- set_irq_handler(i, handle_level_irq);
-
set_irq_chip(i, &int1_chip
);
+ irq_set_chip_and_handler(i, &int1_chip,
+
handle_level_irq
);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
if (INT2_IRQS & (1 << i)) {
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
if (INT2_IRQS & (1 << i)) {
- set_irq_handler(i, handle_level_irq);
-
set_irq_chip(i, &int2_chip
);
+ irq_set_chip_and_handler(i, &int2_chip,
+
handle_level_irq
);
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}