git.openpandora.org
/
pandora-kernel.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/davej/cpufreq
[pandora-kernel.git]
/
arch
/
arm
/
mach-realview
/
core.c
diff --git
a/arch/arm/mach-realview/core.c
b/arch/arm/mach-realview/core.c
index
eb09d38
..
da02869
100644
(file)
--- a/
arch/arm/mach-realview/core.c
+++ b/
arch/arm/mach-realview/core.c
@@
-536,7
+536,7
@@
static irqreturn_t realview_timer_interrupt(int irq, void *dev_id, struct pt_reg
static struct irqaction realview_timer_irq = {
.name = "RealView Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = realview_timer_interrupt,
};