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 branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
arm
/
mach-ep93xx
/
core.c
diff --git
a/arch/arm/mach-ep93xx/core.c
b/arch/arm/mach-ep93xx/core.c
index
26df3b6
..
a87a784
100644
(file)
--- a/
arch/arm/mach-ep93xx/core.c
+++ b/
arch/arm/mach-ep93xx/core.c
@@
-116,7
+116,7
@@
static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ep93xx_timer_irq = {
.name = "ep93xx timer",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = ep93xx_timer_interrupt,
};