From 13956f1384a9ee907cdbe6ad766f06d5c2f02b25 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@freescale.com>
Date: Thu, 20 Oct 2005 11:43:33 -0500
Subject: [PATCH] --- yaml --- r: 11642 b: refs/heads/master c:
 d2e615125762459fd2bb9f0c91881509a0b9c31b h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2f33ec38a2d4..14ce9175d2e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 340601043df518d6f4f82da285c60c785ac8a716
+refs/heads/master: d2e615125762459fd2bb9f0c91881509a0b9c31b
diff --git a/trunk/arch/powerpc/kernel/time.c b/trunk/arch/powerpc/kernel/time.c
index ad501d62aa6e..82f2cabb4f47 100644
--- a/trunk/arch/powerpc/kernel/time.c
+++ b/trunk/arch/powerpc/kernel/time.c
@@ -154,7 +154,7 @@ static __inline__ void timer_check_rtc(void)
          * We should have an rtc call that only sets the minutes and
          * seconds like on Intel to avoid problems with non UTC clocks.
          */
-        if (ntp_synced() &&
+        if (ppc_md.set_rtc_time && ntp_synced() &&
 	    xtime.tv_sec - last_rtc_update >= 659 &&
 	    abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
 	    jiffies - wall_jiffies == 1) {