diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:53:53 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 22:53:53 +0100 |
commit | c15cb37cc4e9809624411333b96109ddf770e29c (patch) | |
tree | 3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /arch/mips/kernel/csrc-r4k.c | |
parent | x86: fix arch/x86/kernel/genx2apic_uv_x.c build warning when !CONFIG_HOTPLUG_CPU (diff) | |
parent | Linux 2.6.28-rc8 (diff) | |
download | linux-c15cb37cc4e9809624411333b96109ddf770e29c.tar.xz linux-c15cb37cc4e9809624411333b96109ddf770e29c.zip |
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'arch/mips/kernel/csrc-r4k.c')
-rw-r--r-- | arch/mips/kernel/csrc-r4k.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 86e026f067bc..74fb74583b4e 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -27,7 +27,7 @@ int __init init_mips_clocksource(void) if (!cpu_has_counter || !mips_hpt_frequency) return -ENXIO; - /* Calclate a somewhat reasonable rating value */ + /* Calculate a somewhat reasonable rating value */ clocksource_mips.rating = 200 + mips_hpt_frequency / 10000000; clocksource_set_clock(&clocksource_mips, mips_hpt_frequency); |