diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
| commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
| tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /drivers/clocksource/timer-u300.c | |
| parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
| parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
| download | linux-67dadcb324c2fe059cb2c35f8b80df42bb23f7c4.tar.bz2 | |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'drivers/clocksource/timer-u300.c')
| -rw-r--r-- | drivers/clocksource/timer-u300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-u300.c b/drivers/clocksource/timer-u300.c index e63d469661fd..5dcf756970e7 100644 --- 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, }; |