From: Shailendra Verma Date: Wed, 20 May 2015 18:36:48 +0000 (+0530) Subject: clk: Fix typo in clk_register() comment X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a59a516398750dc3477a81df34e655b596e352b3;p=linux-beck.git clk: Fix typo in clk_register() comment Signed-off-by: Shailendra Verma Signed-off-by: Stephen Boyd --- 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. */