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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-footbridge
/
isa-timer.c
diff --git
a/arch/arm/mach-footbridge/isa-timer.c
b/arch/arm/mach-footbridge/isa-timer.c
index
282b473
..
c4810a4
100644
(file)
--- a/
arch/arm/mach-footbridge/isa-timer.c
+++ b/
arch/arm/mach-footbridge/isa-timer.c
@@
-73,7
+73,7
@@
isa_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
static struct irqaction isa_timer_irq = {
.name = "ISA timer tick",
.handler = isa_timer_interrupt,
- .flags =
SA_INTERRUPT | SA
_TIMER,
+ .flags =
IRQF_DISABLED | IRQF
_TIMER,
};
static void __init isa_timer_init(void)