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-pnx4008
/
time.c
diff --git
a/arch/arm/mach-pnx4008/time.c
b/arch/arm/mach-pnx4008/time.c
index
4ce6806
..
888bf6c
100644
(file)
--- a/
arch/arm/mach-pnx4008/time.c
+++ b/
arch/arm/mach-pnx4008/time.c
@@
-86,7
+86,7
@@
static irqreturn_t pnx4008_timer_interrupt(int irq, void *dev_id,
static struct irqaction pnx4008_timer_irq = {
.name = "PNX4008 Tick Timer",
static struct irqaction pnx4008_timer_irq = {
.name = "PNX4008 Tick Timer",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = pnx4008_timer_interrupt
};
.handler = pnx4008_timer_interrupt
};