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-iop3xx
/
iop321-time.c
diff --git
a/arch/arm/mach-iop3xx/iop321-time.c
b/arch/arm/mach-iop3xx/iop321-time.c
index
d67ac0e
..
04b1a6f
100644
(file)
--- a/
arch/arm/mach-iop3xx/iop321-time.c
+++ b/
arch/arm/mach-iop3xx/iop321-time.c
@@
-85,7
+85,7
@@
iop321_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction iop321_timer_irq = {
.name = "IOP321 Timer Tick",
.handler = iop321_timer_interrupt,
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
};
static void __init iop321_timer_init(void)