summaryrefslogtreecommitdiffstats
path: root/arch/x86/mach-voyager/setup.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-26 13:22:13 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-26 13:22:13 +0100
commit4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch)
treec7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /arch/x86/mach-voyager/setup.c
parentsched: use TASK_NICE for task_struct (diff)
parentMerge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ad... (diff)
downloadlinux-4434e5156409eb3ec98f5ad7f0a0c07ebafe970d.tar.xz
linux-4434e5156409eb3ec98f5ad7f0a0c07ebafe970d.zip
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
Diffstat (limited to 'arch/x86/mach-voyager/setup.c')
-rw-r--r--arch/x86/mach-voyager/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-voyager/setup.c b/arch/x86/mach-voyager/setup.c
index d914a7996a66..8e5118371f0f 100644
--- a/arch/x86/mach-voyager/setup.c
+++ b/arch/x86/mach-voyager/setup.c
@@ -56,7 +56,7 @@ void __init trap_init_hook(void)
static struct irqaction irq0 = {
.handler = timer_interrupt,
- .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL,
+ .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER,
.mask = CPU_MASK_NONE,
.name = "timer"
};