projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'e26a9e0' into stable/for-linus-3.15
[linux-2.6-block.git]
/
drivers
/
clocksource
/
timer-u300.c
diff --git
a/drivers/clocksource/timer-u300.c
b/drivers/clocksource/timer-u300.c
index e63d469661fd547d49154643ed58bb2dcf100023..5dcf756970e7f733decb1aa437f3f7b20467044b 100644
(file)
--- a/
drivers/clocksource/timer-u300.c
+++ b/
drivers/clocksource/timer-u300.c
@@
-333,7
+333,7
@@
static irqreturn_t u300_timer_interrupt(int irq, void *dev_id)
static struct irqaction u300_timer_irq = {
.name = "U300 Timer Tick",
- .flags = IRQF_
DISABLED | IRQF_
TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = u300_timer_interrupt,
};