diff options
| author | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-10-21 08:26:01 +0400 |
| commit | a13926db3e5ea5bbac297f59e9f35061f52892d3 (patch) | |
| tree | b794f25550b7dbbe9cc8eda81633df9023b4821c /arch/frv/kernel/time.c | |
| parent | f2589bff1ce8b94cebc044e5dfeac4d4e8701cbc (diff) | |
| parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) | |
| download | linux-a13926db3e5ea5bbac297f59e9f35061f52892d3.tar.xz | |
Merge tag 'v3.18-rc1' into for_next
Linux 3.18-rc1
Diffstat (limited to 'arch/frv/kernel/time.c')
| -rw-r--r-- | arch/frv/kernel/time.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c index b457de496b70..332e00bf9d06 100644 --- a/arch/frv/kernel/time.c +++ b/arch/frv/kernel/time.c @@ -44,7 +44,6 @@ static irqreturn_t timer_interrupt(int irq, void *dummy); static struct irqaction timer_irq = { .handler = timer_interrupt, - .flags = IRQF_DISABLED, .name = "timer", }; |