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 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ixp2000
/
core.c
diff --git
a/arch/arm/mach-ixp2000/core.c
b/arch/arm/mach-ixp2000/core.c
index
b31f31a
..
7f91f68
100644
(file)
--- a/
arch/arm/mach-ixp2000/core.c
+++ b/
arch/arm/mach-ixp2000/core.c
@@
-224,7
+224,7
@@
static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction ixp2000_timer_irq = {
.name = "IXP2000 Timer Tick",
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
.handler = ixp2000_timer_interrupt,
};