Merge remote branch 'rmk/for-linus' into for-linus

[~andy/linux] / arch / arm / mach-msm / clock-pcom.c

diff --git a/arch/arm/mach-msm/clock-pcom.c b/arch/arm/mach-msm/clock-pcom.c
index a3b45627eb4aa4cb57530c29601436f51746f97d..63b7113110869dc0ab48b14b81f2361ded53e314 100644 (file)
--- a/arch/arm/mach-msm/clock-pcom.c
+++ b/arch/arm/mach-msm/clock-pcom.c
@@ -20,6 +20,7 @@
 
 #include "proc_comm.h"
 #include "clock.h"
+#include "clock-pcom.h"
 
 /*
  * glue for the proc_comm interface
@@ -116,6 +117,11 @@ long pc_clk_round_rate(unsigned id, unsigned rate)
        return rate;
 }
 
+static bool pc_clk_is_local(unsigned id)
+{
+       return false;
+}
+
 struct clk_ops clk_ops_pcom = {
        .enable = pc_clk_enable,
        .disable = pc_clk_disable,
@@ -128,4 +134,5 @@ struct clk_ops clk_ops_pcom = {
        .get_rate = pc_clk_get_rate,
        .is_enabled = pc_clk_is_enabled,
        .round_rate = pc_clk_round_rate,
+       .is_local = pc_clk_is_local,
 };