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 'old_next' into next
[pandora-kernel.git]
/
arch
/
arm
/
mach-gemini
/
irq.c
diff --git
a/arch/arm/mach-gemini/irq.c
b/arch/arm/mach-gemini/irq.c
index
96bc227
..
9485a8f
100644
(file)
--- a/
arch/arm/mach-gemini/irq.c
+++ b/
arch/arm/mach-gemini/irq.c
@@
-81,13
+81,13
@@
void __init gemini_init_irq(void)
request_resource(&iomem_resource, &irq_resource);
for (i = 0; i < NR_IRQS; i++) {
request_resource(&iomem_resource, &irq_resource);
for (i = 0; i < NR_IRQS; i++) {
-
set_irq
_chip(i, &gemini_irq_chip);
+
irq_set
_chip(i, &gemini_irq_chip);
if((i >= IRQ_TIMER1 && i <= IRQ_TIMER3) || (i >= IRQ_SERIRQ0 && i <= IRQ_SERIRQ1)) {
if((i >= IRQ_TIMER1 && i <= IRQ_TIMER3) || (i >= IRQ_SERIRQ0 && i <= IRQ_SERIRQ1)) {
-
set_irq
_handler(i, handle_edge_irq);
+
irq_set
_handler(i, handle_edge_irq);
mode |= 1 << i;
level |= 1 << i;
} else {
mode |= 1 << i;
level |= 1 << i;
} else {
-
set_irq
_handler(i, handle_level_irq);
+
irq_set
_handler(i, handle_level_irq);
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}
}
set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
}