summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/time.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-07 09:07:13 +0200
committerOlof Johansson <olof@lixom.net>2013-10-07 09:32:46 -0700
commit1091a654ac1722b6ab4fc6533925c1a02486fff4 (patch)
tree867d134b9ca93a12898816f62b1dadf1511e7445 /arch/arm/mach-davinci/time.c
parentfca9b5ea3eefcbeabc98b48c00c1594aa413dd46 (diff)
downloadtalos-op-linux-1091a654ac1722b6ab4fc6533925c1a02486fff4.tar.gz
talos-op-linux-1091a654ac1722b6ab4fc6533925c1a02486fff4.zip
ARM: davinci: remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from Davinci code ;) It's a NOOP since 2.6.35, and will be removed one day Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-davinci/time.c')
-rw-r--r--arch/arm/mach-davinci/time.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 7a55b5c95971..e7ada0ca72ee 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -181,7 +181,7 @@ static struct timer_s timers[] = {
.name = "clockevent",
.opts = TIMER_OPTS_DISABLED,
.irqaction = {
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = timer_interrupt,
}
},
@@ -190,7 +190,7 @@ static struct timer_s timers[] = {
.period = ~0,
.opts = TIMER_OPTS_PERIODIC,
.irqaction = {
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = freerun_interrupt,
}
},
OpenPOWER on IntegriCloud