---

yaml --- r: 275407 b: refs/heads/master c: 188d7c6 h: refs/heads/master i: 275405: 3e2612f 275403: 3f1556a 275399: 215d59f 275391: 56883d8 v: v3
git-mirror · Nov 3, 2011 · ac94bb7 · ac94bb7
1 parent 5283d34
commit ac94bb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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