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 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mxs
/
icoll.c
diff --git
a/arch/arm/mach-mxs/icoll.c
b/arch/arm/mach-mxs/icoll.c
index
0f4c120
..
23ca9d0
100644
(file)
--- a/
arch/arm/mach-mxs/icoll.c
+++ b/
arch/arm/mach-mxs/icoll.c
@@
-74,8
+74,7
@@
void __init icoll_init_irq(void)
mxs_reset_block(icoll_base + HW_ICOLL_CTRL);
for (i = 0; i < MXS_INTERNAL_IRQS; i++) {
mxs_reset_block(icoll_base + HW_ICOLL_CTRL);
for (i = 0; i < MXS_INTERNAL_IRQS; i++) {
- set_irq_chip(i, &mxs_icoll_chip);
- set_irq_handler(i, handle_level_irq);
+ irq_set_chip_and_handler(i, &mxs_icoll_chip, handle_level_irq);
set_irq_flags(i, IRQF_VALID);
}
}
set_irq_flags(i, IRQF_VALID);
}
}