projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-netx
/
time.c
diff --git
a/arch/arm/mach-netx/time.c
b/arch/arm/mach-netx/time.c
index e2346013e2273b9daafe57c8ab728e3bee1cb638..5fb2a590ec17dfe94931c9685d9748ee722e3992 100644
(file)
--- a/
arch/arm/mach-netx/time.c
+++ b/
arch/arm/mach-netx/time.c
@@
-102,7
+102,7
@@
netx_timer_interrupt(int irq, void *dev_id)
static struct irqaction netx_timer_irq = {
.name = "NetX Timer Tick",
- .flags = IRQF_
DISABLED | IRQF_
TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = netx_timer_interrupt,
};