aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/platform/coldfire/timers.c
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@free-electrons.com>2013-09-07 01:43:08 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-09-26 03:54:16 -0400
commit77a42796786c2ea2d3a67262fb5f1f707c3e0594 (patch)
treea93f7eac94f0d118ebda42509093b872f7b0efd0 /arch/m68k/platform/coldfire/timers.c
parent21e884bafa039fab0facd327c9380b58151e73f2 (diff)
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/coldfire/timers.c')
-rw-r--r--arch/m68k/platform/coldfire/timers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/platform/coldfire/timers.c b/arch/m68k/platform/coldfire/timers.c
index d06068e45764..cd496a20fcc7 100644
--- a/arch/m68k/platform/coldfire/timers.c
+++ b/arch/m68k/platform/coldfire/timers.c
@@ -83,7 +83,7 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)
83 83
84static struct irqaction mcftmr_timer_irq = { 84static struct irqaction mcftmr_timer_irq = {
85 .name = "timer", 85 .name = "timer",
86 .flags = IRQF_DISABLED | IRQF_TIMER, 86 .flags = IRQF_TIMER,
87 .handler = mcftmr_tick, 87 .handler = mcftmr_tick,
88}; 88};
89 89
@@ -171,7 +171,7 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)
171 171
172static struct irqaction coldfire_profile_irq = { 172static struct irqaction coldfire_profile_irq = {
173 .name = "profile timer", 173 .name = "profile timer",
174 .flags = IRQF_DISABLED | IRQF_TIMER, 174 .flags = IRQF_TIMER,
175 .handler = coldfire_profile_tick, 175 .handler = coldfire_profile_tick,
176}; 176};
177 177