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
/
i386
/
mach-voyager
/
setup.c
diff --git
a/arch/i386/mach-voyager/setup.c
b/arch/i386/mach-voyager/setup.c
index
9da9ef0
..
cfa16c1
100644
(file)
--- a/
arch/i386/mach-voyager/setup.c
+++ b/
arch/i386/mach-voyager/setup.c
@@
-40,7
+40,7
@@
void __init trap_init_hook(void)
{
}
-static struct irqaction irq0 = { timer_interrupt,
SA_INTERRUPT
, CPU_MASK_NONE, "timer", NULL, NULL};
+static struct irqaction irq0 = { timer_interrupt,
IRQF_DISABLED
, CPU_MASK_NONE, "timer", NULL, NULL};
void __init time_init_hook(void)
{