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-lh7a40x
/
time.c
diff --git
a/arch/arm/mach-lh7a40x/time.c
b/arch/arm/mach-lh7a40x/time.c
index bef3c4b68d3bb3e028521f3c140fb91e4f80f1eb..c25316d02537ef0dc34563b6c4d1bfae1a1de134 100644
(file)
--- a/
arch/arm/mach-lh7a40x/time.c
+++ b/
arch/arm/mach-lh7a40x/time.c
@@
-53,7
+53,7
@@
lh7a40x_timer_interrupt(int irq, void *dev_id)
static struct irqaction lh7a40x_timer_irq = {
.name = "LHA740x Timer Tick",
- .flags = IRQF_DISABLED | IRQF_TIMER,
+ .flags = IRQF_DISABLED | IRQF_TIMER
| IRQF_IRQPOLL
,
.handler = lh7a40x_timer_interrupt,
};