diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 14:02:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-25 14:02:33 -0800 |
| commit | 958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61 (patch) | |
| tree | 31098a5fd8cb6b59f20d56557551881dfe8a410c /arch/x86/kernel/apb_timer.c | |
| parent | d40358509ee862d7e4049187bc05eba1911a2959 (diff) | |
| parent | 7f74f8f28a2bd9db9404f7d364e2097a0c42cc12 (diff) | |
| download | linux-958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61.tar.gz linux-958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61.tar.bz2 linux-958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61.zip | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86 quirk: Fix polarity for IRQ0 pin2 override on SB800 systems
x86/mrst: Fix apb timer rating when lapic timer is used
x86: Fix reboot problem on VersaLogic Menlow boards
Diffstat (limited to 'arch/x86/kernel/apb_timer.c')
| -rw-r--r-- | arch/x86/kernel/apb_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c index 51ef31a89be9..51d4e1663066 100644 --- a/arch/x86/kernel/apb_timer.c +++ b/arch/x86/kernel/apb_timer.c @@ -284,7 +284,7 @@ static int __init apbt_clockevent_register(void) memcpy(&adev->evt, &apbt_clockevent, sizeof(struct clock_event_device)); if (mrst_timer_options == MRST_TIMER_LAPIC_APBT) { - apbt_clockevent.rating = APBT_CLOCKEVENT_RATING - 100; + adev->evt.rating = APBT_CLOCKEVENT_RATING - 100; global_clock_event = &adev->evt; printk(KERN_DEBUG "%s clockevent registered as global\n", global_clock_event->name); |