aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/pmac_time.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-12 14:43:32 +1000
committerPaul Mackerras <paulus@samba.org>2005-10-12 14:43:32 +1000
commitb6ec995a21a9428aef620b5adf46d047a18d88b8 (patch)
tree6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ppc/platforms/pmac_time.c
parent3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff)
parentda64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff)
downloadkernel_samsung_aries-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip
kernel_samsung_aries-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.gz
kernel_samsung_aries-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.bz2
Merge from Linus' tree
Diffstat (limited to 'arch/ppc/platforms/pmac_time.c')
-rw-r--r--arch/ppc/platforms/pmac_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/platforms/pmac_time.c b/arch/ppc/platforms/pmac_time.c
index ff6adff..edb9fcc 100644
--- a/arch/ppc/platforms/pmac_time.c
+++ b/arch/ppc/platforms/pmac_time.c
@@ -195,7 +195,7 @@ via_calibrate_decr(void)
;
dend = get_dec();
- tb_ticks_per_jiffy = (dstart - dend) / (6 * (HZ/100));
+ tb_ticks_per_jiffy = (dstart - dend) / ((6 * HZ)/100);
tb_to_us = mulhwu_scale_factor(dstart - dend, 60000);
printk(KERN_INFO "via_calibrate_decr: ticks per jiffy = %u (%u ticks)\n",