diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-03-15 21:41:23 -0400 |
| commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
| tree | fcdedce488db0f80c7a816e0b52df83a01972838 /arch/x86/mach-default/setup.c | |
| parent | ace14b82633960a2b6bf6a0b2640c63872a65562 (diff) | |
| parent | 305b07680f6c6a7e59f996c5bd85f009caff5bb1 (diff) | |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'arch/x86/mach-default/setup.c')
| -rw-r--r-- | arch/x86/mach-default/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c index a265a7c6319..50b59187112 100644 --- a/arch/x86/mach-default/setup.c +++ b/arch/x86/mach-default/setup.c @@ -96,7 +96,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" }; |