diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 04:02:12 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 04:02:12 -0400 |
commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /arch/arm/kernel/smp_twd.c | |
parent | 7653aaab775d4c205a7dce52850c8e3d4f31d4ea (diff) | |
parent | b63d10130e68aa6480cc1b2483d7c5ce57a05481 (diff) |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'arch/arm/kernel/smp_twd.c')
-rw-r--r-- | arch/arm/kernel/smp_twd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c index 60636f499cb3..2c277d40cee6 100644 --- a/arch/arm/kernel/smp_twd.c +++ b/arch/arm/kernel/smp_twd.c | |||
@@ -115,7 +115,7 @@ static void __cpuinit twd_calibrate_rate(void) | |||
115 | twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); | 115 | twd_timer_rate = (0xFFFFFFFFU - count) * (HZ / 5); |
116 | 116 | ||
117 | printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, | 117 | printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000, |
118 | (twd_timer_rate / 1000000) % 100); | 118 | (twd_timer_rate / 10000) % 100); |
119 | } | 119 | } |
120 | } | 120 | } |
121 | 121 | ||