projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
m68k
/
platform
/
68000
/
timers.c
diff --git
a/arch/m68k/platform/68000/timers.c
b/arch/m68k/platform/68000/timers.c
index
ec30acb
..
99a9869
100644
(file)
--- 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,
};