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 'irq-final-for-linus-v2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-rpc
/
irq.c
diff --git
a/arch/arm/mach-rpc/irq.c
b/arch/arm/mach-rpc/irq.c
index
d29cd9b
..
2e1b530
100644
(file)
--- a/
arch/arm/mach-rpc/irq.c
+++ b/
arch/arm/mach-rpc/irq.c
@@
-133,25
+133,25
@@
void __init rpc_init_irq(void)
switch (irq) {
case 0 ... 7:
switch (irq) {
case 0 ... 7:
- set_irq_chip(irq, &iomd_a_chip);
-
set_irq_handler(irq,
handle_level_irq);
+ irq_set_chip_and_handler(irq, &iomd_a_chip,
+
handle_level_irq);
set_irq_flags(irq, flags);
break;
case 8 ... 15:
set_irq_flags(irq, flags);
break;
case 8 ... 15:
- set_irq_chip(irq, &iomd_b_chip);
-
set_irq_handler(irq,
handle_level_irq);
+ irq_set_chip_and_handler(irq, &iomd_b_chip,
+
handle_level_irq);
set_irq_flags(irq, flags);
break;
case 16 ... 21:
set_irq_flags(irq, flags);
break;
case 16 ... 21:
- set_irq_chip(irq, &iomd_dma_chip);
-
set_irq_handler(irq,
handle_level_irq);
+ irq_set_chip_and_handler(irq, &iomd_dma_chip,
+
handle_level_irq);
set_irq_flags(irq, flags);
break;
case 64 ... 71:
set_irq_flags(irq, flags);
break;
case 64 ... 71:
-
set_irq
_chip(irq, &iomd_fiq_chip);
+
irq_set
_chip(irq, &iomd_fiq_chip);
set_irq_flags(irq, IRQF_VALID);
break;
}
set_irq_flags(irq, IRQF_VALID);
break;
}