From ac94bb710c3b262e5f0b637a6fccb1b18829a58a Mon Sep 17 00:00:00 2001
From: Jason Liu <jason.hui@linaro.org>
Date: Thu, 3 Nov 2011 17:31:27 +0800
Subject: [PATCH] --- yaml --- r: 275407 b: refs/heads/master c:
 188d7c6b0cfee134cc7fbc61d36223b1d7dfffab h: refs/heads/master i:   275405:
 3e2612f128736d86f21837f8db5944f83d1678a4   275403:
 3f1556a4db4abda0177e77dd2e1a182f063b2ce6   275399:
 215d59f1e299684c1ad093b443797be79c976859   275391:
 56883d8141a824009d1609a06d01ce232b924d5d v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/arm/mach-mx5/clock-mx51-mx53.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4ba93ee7cfc1..97f3f56b3018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98de0cbbe2e7157fd87d04386621be3eadd4d6ab
+refs/heads/master: 188d7c6b0cfee134cc7fbc61d36223b1d7dfffab
diff --git a/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c b/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c
index 2aacf41c48e7..6312425c0056 100644
--- a/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/trunk/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1634,6 +1634,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc,
 	return 0;
 }
 
+#ifdef CONFIG_OF
 static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc,
 				   unsigned long *ckih1, unsigned long *ckih2)
 {
@@ -1671,3 +1672,4 @@ int __init mx53_clocks_init_dt(void)
 	clk_get_freq_dt(&ckil, &osc, &ckih1, &ckih2);
 	return mx53_clocks_init(ckil, osc, ckih1, ckih2);
 }
+#endif