summaryrefslogtreecommitdiff
path: root/arch/arm/plat-iop/time.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael@free-electrons.com>2014-03-05 01:04:50 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-03-12 14:32:38 +0400
commit78f6db99522bbdd2f2a90c963744bd51c8602990 (patch)
tree25ba7eb37ea119658fb436e50c889a09d485071d /arch/arm/plat-iop/time.c
parenta09df10585d3b3b7a2f640b11fabea262e751091 (diff)
downloadlinux-78f6db99522bbdd2f2a90c963744bd51c8602990.tar.xz
ARM: 8000/1: misc: remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag from miscellaneous code in mach-xxx and plat-xxx This flag is a NOOP since 2.6.35 and it will be removed one day. Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/plat-iop/time.c')
-rw-r--r--arch/arm/plat-iop/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-iop/time.c b/arch/arm/plat-iop/time.c
index d70b73364a3f..6ad65d8ae237 100644
--- a/arch/arm/plat-iop/time.c
+++ b/arch/arm/plat-iop/time.c
@@ -127,7 +127,7 @@ iop_timer_interrupt(int irq, void *dev_id)
static struct irqaction iop_timer_irq = {
.name = "IOP Timer Tick",
.handler = iop_timer_interrupt,
- .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.dev_id = &iop_clockevent,
};