summaryrefslogtreecommitdiffstats
path: root/arch/arm/common/timer-sp.c
diff options
context:
space:
mode:
authorMichael Opdenacker2013-10-14 05:42:20 +0200
committerRussell King2013-10-29 12:06:17 +0100
commit728fae6f6f73b34cf94afe6c87ce102889abc786 (patch)
tree71f9fe176182771cef9d1ad02e8c1e5e133e3192 /arch/arm/common/timer-sp.c
parentARM: 7858/1: mm: make UACCESS_WITH_MEMCPY huge page aware (diff)
downloadkernel-qcow2-linux-728fae6f6f73b34cf94afe6c87ce102889abc786.tar.gz
kernel-qcow2-linux-728fae6f6f73b34cf94afe6c87ce102889abc786.tar.xz
kernel-qcow2-linux-728fae6f6f73b34cf94afe6c87ce102889abc786.zip
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>
Diffstat (limited to 'arch/arm/common/timer-sp.c')
-rw-r--r--arch/arm/common/timer-sp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index e901d0f3e0bb..ce922d0ea7aa 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -175,7 +175,7 @@ static struct clock_event_device sp804_clockevent = {
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,
};