summaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/68000/timers.c
diff options
context:
space:
mode:
authorMichael Opdenacker2013-09-07 07:43:08 +0200
committerGeert Uytterhoeven2013-09-26 09:54:16 +0200
commit77a42796786c2ea2d3a67262fb5f1f707c3e0594 (patch)
treea93f7eac94f0d118ebda42509093b872f7b0efd0 /arch/m68k/platform/68000/timers.c
parentm68k/m68knommu: Implement __get_user_unaligned/__put_user_unaligned() (diff)
downloadkernel-qcow2-linux-77a42796786c2ea2d3a67262fb5f1f707c3e0594.tar.gz
kernel-qcow2-linux-77a42796786c2ea2d3a67262fb5f1f707c3e0594.tar.xz
kernel-qcow2-linux-77a42796786c2ea2d3a67262fb5f1f707c3e0594.zip
m68k: Remove deprecated IRQF_DISABLED
This patch proposes to remove the IRQF_DISABLED flag from m68k architecture code. 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: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/platform/68000/timers.c')
-rw-r--r--arch/m68k/platform/68000/timers.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/platform/68000/timers.c b/arch/m68k/platform/68000/timers.c
index ec30acbfe6db..99a98698bc95 100644
--- a/arch/m68k/platform/68000/timers.c
+++ b/arch/m68k/platform/68000/timers.c
@@ -70,7 +70,7 @@ static irqreturn_t hw_tick(int irq, void *dummy)
static struct irqaction m68328_timer_irq = {
.name = "timer",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_TIMER,
.handler = hw_tick,
};