diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:27 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 10:58:27 (GMT) |
| commit | ec1e20a02fe33b767ffcca8920a32211492416d7 (patch) | |
| tree | 85cfc0bbc1aac672b5ee4d540d1eeb2cc0d96f61 /arch/arm/common/timer-sp.c | |
| parent | 959f58544b7f20c92d5eb43d1232c96c15c01bfb (diff) | |
| parent | aed3a4ed7222ae37860ae33cbad3ea7a6b2eaf8e (diff) | |
| download | linux-fsl-qoriq-ec1e20a02fe33b767ffcca8920a32211492416d7.tar.xz | |
Merge branch 'misc' into for-next
Diffstat (limited to 'arch/arm/common/timer-sp.c')
| -rw-r--r-- | arch/arm/common/timer-sp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index e901d0f..ce922d0 100644 --- a/arch/arm/common/timer-sp.c +++ b/arch/arm/common/timer-sp.c @@ -175,7 +175,7 @@ static struct clock_event_device sp804_clockevent = { static struct irqaction sp804_timer_irq = { .name = "timer", - .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, + .flags = IRQF_TIMER | IRQF_IRQPOLL, .handler = sp804_timer_interrupt, .dev_id = &sp804_clockevent, }; |