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 git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
irq-pxa168.c
diff --git
a/arch/arm/mach-mmp/irq-pxa168.c
b/arch/arm/mach-mmp/irq-pxa168.c
index
f86b450
..
89706a0
100644
(file)
--- a/
arch/arm/mach-mmp/irq-pxa168.c
+++ b/
arch/arm/mach-mmp/irq-pxa168.c
@@
-48,8
+48,7
@@
void __init icu_init_irq(void)
for (irq = 0; irq < 64; irq++) {
icu_mask_irq(irq_get_irq_data(irq));
- set_irq_chip(irq, &icu_irq_chip);
- set_irq_handler(irq, handle_level_irq);
+ irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
set_irq_flags(irq, IRQF_VALID);
}
}