diff --git a/[refs] b/[refs]
index c56e43fe175c..aa66143ca926 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15d2c83948a3f47095017dbcf2060132bcd8c00c
+refs/heads/master: 173bf69a7af142e0325fa514954f6eeb2d20cc1d
diff --git a/trunk/arch/arm/mach-shmobile/timer.c b/trunk/arch/arm/mach-shmobile/timer.c
index cba39d866687..a68919727e24 100644
--- a/trunk/arch/arm/mach-shmobile/timer.c
+++ b/trunk/arch/arm/mach-shmobile/timer.c
@@ -36,7 +36,8 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz,
 
 	unsigned int value = (1000000 * mult) / (HZ * div);
 
-	lpj_fine = max_cpu_core_mhz * value;
+	if (!preset_lpj)
+		preset_lpj = max_cpu_core_mhz * value;
 }
 
 static void __init shmobile_late_time_init(void)