projects
/
cascardo
/
linux.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/vapier...
[cascardo/linux.git]
/
arch
/
arm
/
mach-shark
/
irq.c
diff --git
a/arch/arm/mach-shark/irq.c
b/arch/arm/mach-shark/irq.c
index
831fc66
..
5dce13e
100644
(file)
--- a/
arch/arm/mach-shark/irq.c
+++ b/
arch/arm/mach-shark/irq.c
@@
-80,8
+80,7
@@
void __init shark_init_irq(void)
int irq;
for (irq = 0; irq < NR_IRQS; irq++) {
- set_irq_chip(irq, &fb_chip);
- set_irq_handler(irq, handle_edge_irq);
+ irq_set_chip_and_handler(irq, &fb_chip, handle_edge_irq);
set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
}