diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 07:53:39 -0500 |
| commit | 5359c32eb7402124abc9964d5d53639fe0739cea (patch) | |
| tree | d77b6967fe8420678bb9d1d936855ac0699c196a /arch/x86/kernel/mfgpt_32.c | |
| parent | 8916edef5888c5d8fe283714416a9ca95b4c3431 (diff) | |
| parent | fe0bdec68b77020281dc814805edfe594ae89e0f (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/x86/kernel/mfgpt_32.c')
| -rw-r--r-- | arch/x86/kernel/mfgpt_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/mfgpt_32.c b/arch/x86/kernel/mfgpt_32.c index 3b599518c322..c12314c9e86f 100644 --- a/arch/x86/kernel/mfgpt_32.c +++ b/arch/x86/kernel/mfgpt_32.c | |||
| @@ -287,7 +287,7 @@ static struct clock_event_device mfgpt_clockevent = { | |||
| 287 | .set_mode = mfgpt_set_mode, | 287 | .set_mode = mfgpt_set_mode, |
| 288 | .set_next_event = mfgpt_next_event, | 288 | .set_next_event = mfgpt_next_event, |
| 289 | .rating = 250, | 289 | .rating = 250, |
| 290 | .cpumask = CPU_MASK_ALL, | 290 | .cpumask = cpu_all_mask, |
| 291 | .shift = 32 | 291 | .shift = 32 |
| 292 | }; | 292 | }; |
| 293 | 293 | ||