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
/
plat-iop
/
time.c
diff --git
a/arch/arm/plat-iop/time.c
b/arch/arm/plat-iop/time.c
index 0cc26da034a12458e515429f8ce75d71eba4bca5..100d57ad98ed82636c87282501e4adaaa73f70b1 100644
(file)
--- a/
arch/arm/plat-iop/time.c
+++ b/
arch/arm/plat-iop/time.c
@@
-75,7
+75,7
@@
iop_timer_interrupt(int irq, void *dev_id)
static struct irqaction iop_timer_irq = {
.name = "IOP Timer Tick",
.handler = iop_timer_interrupt,
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_DISABLED | IRQF_TIMER
| IRQF_IRQPOLL
,
};
void __init iop_init_time(unsigned long tick_rate)