projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-v3.13/clock-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
time.c
diff --git
a/arch/arm/mach-imx/time.c
b/arch/arm/mach-imx/time.c
index
cd46529
..
9b6638a
100644
(file)
--- a/
arch/arm/mach-imx/time.c
+++ b/
arch/arm/mach-imx/time.c
@@
-250,7
+250,7
@@
static irqreturn_t mxc_timer_interrupt(int irq, void *dev_id)
static struct irqaction mxc_timer_irq = {
.name = "i.MX Timer Tick",
- .flags = IRQF_
DISABLED | IRQF_
TIMER | IRQF_IRQPOLL,
+ .flags = IRQF_TIMER | IRQF_IRQPOLL,
.handler = mxc_timer_interrupt,
};