summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mmp/time.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-04 22:07:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 10:32:40 +0000
commit9929eedc0c3495105018f3c632ee73b7fb4c1f72 (patch)
treeac37801d43b811ea0ae8b7a739557255052b0ccf /arch/arm/mach-mmp/time.c
parent78f6db99522bbdd2f2a90c963744bd51c8602990 (diff)
downloadlinux-9929eedc0c3495105018f3c632ee73b7fb4c1f72.tar.bz2
ARM: 8001/1: mmp: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from arch/arm/mach-mmp/time.c It's a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-mmp/time.c')
-rw-r--r--arch/arm/mach-mmp/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c
index 024022d91fe3..bbcd2322fd27 100644
--- a/arch/arm/mach-mmp/time.c
+++ b/arch/arm/mach-mmp/time.c
@@ -186,7 +186,7 @@ static void __init timer_config(void)
static struct irqaction timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = timer_interrupt,
.dev_id = &ckevt,
};