projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-integrator
/
core.c
diff --git
a/arch/arm/mach-integrator/core.c
b/arch/arm/mach-integrator/core.c
index 8d880cb9ba39f4795166274d961f7763b87a7083..897c21c2fb5b442f1ef3823f109921688d0cd9b9 100644
(file)
--- a/
arch/arm/mach-integrator/core.c
+++ b/
arch/arm/mach-integrator/core.c
@@
-282,7
+282,7
@@
integrator_timer_interrupt(int irq, void *dev_id)
static struct irqaction integrator_timer_irq = {
.name = "Integrator Timer Tick",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_DISABLED | IRQF_TIMER
| IRQF_IRQPOLL
,
.handler = integrator_timer_interrupt,
};