From 59cae75c548f56a43840b679b9e04aaa3497bd13 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Wed, 3 Oct 2012 23:38:54 -0700 Subject: [PATCH] --- yaml --- r: 336467 b: refs/heads/master c: 7ce3e8ccbac708229ba8c40c9c2a43ca7fcdb3ae h: refs/heads/master i: 336465: 46b9321b533aa078fe033a78fa3811dec909cad6 336463: b52ce38a2e19e4c72c7e1194e636e8f259687b65 v: v3 --- [refs] | 2 +- trunk/include/linux/clk-provider.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7a8808999b67..fe587d1c029d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 119c71276b43e3daf5e7b0661dcf63f224e2fc8d +refs/heads/master: 7ce3e8ccbac708229ba8c40c9c2a43ca7fcdb3ae diff --git a/trunk/include/linux/clk-provider.h b/trunk/include/linux/clk-provider.h index 2aa808bdc257..e1d83b187df2 100644 --- a/trunk/include/linux/clk-provider.h +++ b/trunk/include/linux/clk-provider.h @@ -57,9 +57,9 @@ struct clk_hw; * This function must not sleep. Optional, if this op is not * set then the enable count will be used. * - * @recalc_rate Recalculate the rate of this clock, by quering hardware. The + * @recalc_rate Recalculate the rate of this clock, by querying hardware. The * parent rate is an input parameter. It is up to the caller to - * insure that the prepare_mutex is held across this call. + * ensure that the prepare_mutex is held across this call. * Returns the calculated rate. Optional, but recommended - if * this op is not set then clock rate will be initialized to 0. * @@ -93,7 +93,7 @@ struct clk_hw; * implementations to split any work between atomic (enable) and sleepable * (prepare) contexts. If enabling a clock requires code that might sleep, * this must be done in clk_prepare. Clock enable code that will never be - * called in a sleepable context may be implement in clk_enable. + * called in a sleepable context may be implemented in clk_enable. * * Typically, drivers will call clk_prepare when a clock may be needed later * (eg. when a device is opened), and clk_enable when the clock is actually