projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...
[cascardo/linux.git]
/
arch
/
unicore32
/
kernel
/
time.c
diff --git
a/arch/unicore32/kernel/time.c
b/arch/unicore32/kernel/time.c
index
080710c
..
d3824b2
100644
(file)
--- a/
arch/unicore32/kernel/time.c
+++ b/
arch/unicore32/kernel/time.c
@@
-86,7
+86,7
@@
static struct clocksource cksrc_puv3_oscr = {
static struct irqaction puv3_timer_irq = {
.name = "ost0",
- .flags = IRQF_
DISABLED | IRQF_
TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = puv3_ost0_interrupt,
.dev_id = &ckevt_puv3_osmr0,
};