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 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...
[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
69ca0dd
..
6c8d5f8
100644
(file)
--- a/
arch/arm/mach-msm/irq.c
+++ b/
arch/arm/mach-msm/irq.c
@@
-101,11
+101,11
@@
static int msm_irq_set_type(unsigned int irq, unsigned int flow_type)
if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
writel(readl(treg) | b, treg);
if (flow_type & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING)) {
writel(readl(treg) | b, treg);
-
set_irq_handler(irq, handle_edge_irq)
;
+
irq_desc[irq].handle_irq = handle_edge_irq
;
}
if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) {
writel(readl(treg) & (~b), treg);
}
if (flow_type & (IRQF_TRIGGER_HIGH | IRQF_TRIGGER_LOW)) {
writel(readl(treg) & (~b), treg);
-
set_irq_handler(irq, handle_level_irq)
;
+
irq_desc[irq].handle_irq = handle_level_irq
;
}
return 0;
}
}
return 0;
}