diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /arch/x86/mach-default/setup.c | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
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 a265a7c63190..50b591871128 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) | |||
| 96 | 96 | ||
| 97 | static struct irqaction irq0 = { | 97 | static struct irqaction irq0 = { |
| 98 | .handler = timer_interrupt, | 98 | .handler = timer_interrupt, |
| 99 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, | 99 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL | IRQF_TIMER, |
| 100 | .mask = CPU_MASK_NONE, | 100 | .mask = CPU_MASK_NONE, |
| 101 | .name = "timer" | 101 | .name = "timer" |
| 102 | }; | 102 | }; |