summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShailendra Verma <shailendra.capricorn@gmail.com>2015-05-21 00:06:48 +0530
committerStephen Boyd <sboyd@codeaurora.org>2015-05-20 15:44:32 -0700
commita59a516398750dc3477a81df34e655b596e352b3 (patch)
tree8fe30db0d8803324f18d69a8fe843ddd85c4f67e
parent9c684e290d1741e068cc226418a26a39663db010 (diff)
downloadlinux-stable-a59a516398750dc3477a81df34e655b596e352b3.tar.gz
linux-stable-a59a516398750dc3477a81df34e655b596e352b3.tar.bz2
linux-stable-a59a516398750dc3477a81df34e655b596e352b3.zip
clk: Fix typo in clk_register() comment
Signed-off-by: Shailendra Verma <shailendra.capricorn@gmail.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
-rw-r--r--drivers/clk/clk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index c44623fe9c48..a522dbbc01b9 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -2442,7 +2442,7 @@ void __clk_free_clk(struct clk *clk)
*
* clk_register is the primary interface for populating the clock tree with new
* clock nodes. It returns a pointer to the newly allocated struct clk which
- * cannot be dereferenced by driver code but may be used in conjuction with the
+ * cannot be dereferenced by driver code but may be used in conjunction with the
* rest of the clock API. In the event of an error clk_register will return an
* error code; drivers must test for an error code after calling clk_register.
*/