commit 728fae6f6f73b34cf94afe6c87ce102889abc786
author Michael Opdenacker <michael@free-electrons.com> Mon Oct 14 04:42:20 2013 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Oct 29 11:06:17 2013 +0000
tree 71f9fe176182771cef9d1ad02e8c1e5e133e3192
parent a3a9ea656d19251326cdeaaa0b5adbfac41ddacf

ARM: 7856/1: timer-sp: remove deprecated IRQF_DISABLED

This patch proposes to remove the use of the IRQF_DISABLED flag

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>

arch/arm/common/timer-sp.c

diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index e901d0f..ce922d0 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -175,7 +175,7 @@
 
 static struct irqaction sp804_timer_irq = {
 	.name		= "timer",
-	.flags		= IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
+	.flags		= IRQF_TIMER | IRQF_IRQPOLL,
 	.handler	= sp804_timer_interrupt,
 	.dev_id		= &sp804_clockevent,
 };