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 'topic/lola' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
irq.c
diff --git
a/arch/arm/mach-msm/irq.c
b/arch/arm/mach-msm/irq.c
index
782e805
..
ea514be
100644
(file)
--- a/
arch/arm/mach-msm/irq.c
+++ b/
arch/arm/mach-msm/irq.c
@@
-145,8
+145,7
@@
void __init msm_init_irq(void)
writel(1, VIC_INT_MASTEREN);
for (n = 0; n < NR_MSM_IRQS; n++) {
- irq_set_chip(n, &msm_irq_chip);
- irq_set_handler(n, handle_level_irq);
+ irq_set_chip_and_handler(n, &msm_irq_chip, handle_level_irq);
set_irq_flags(n, IRQF_VALID);
}
}