commit 77670789ba0be416e639ec8939964acd4c4a8693
author Linux Build Service Account <lnxbuild@localhost> Fri Jan 20 08:40:30 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Fri Jan 20 08:40:30 2012 -0800
tree 8d5fb3ce7c29da159699625bf52df6d702d34415
parent 296ee48e9ac0cc8a3df3eaa5a24131a700c2974b
parent 36466aee75e3bd66a8b79ba23ea00b59d883546e

Merge "msm: clock-8960: Switch adm to ebi1_clk" into msm-3.0

arch/arm/mach-msm/clock-8960.c

diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 68c5059..09f70f1 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -4450,11 +4450,7 @@
 static DEFINE_CLK_VOTER(dfab_scm_clk, &dfab_clk.c);
 
 static DEFINE_CLK_VOTER(ebi1_msmbus_clk, &ebi1_clk.c);
-/*
- * TODO: replace dummy_clk below with ebi1_clk.c once the
- * bus driver starts voting on ebi1 rates.
- */
-static DEFINE_CLK_VOTER(ebi1_adm_clk,    &dummy_clk);
+static DEFINE_CLK_VOTER(ebi1_adm_clk, &ebi1_clk.c);
 
 #ifdef CONFIG_DEBUG_FS
 struct measure_sel {