diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2018-01-26 16:42:03 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2018-01-26 16:43:14 -0800 |
| commit | 716d9b1d4a88493ec3e52957cc1026d32534ee67 (patch) | |
| tree | f1f9c9d73a5527e23e1a476cb2acbdad9e81f09f /include/linux/clk-provider.h | |
| parent | Merge branches 'clk-iproc', 'clk-mvebu' and 'clk-qcom-a53' into clk-next (diff) | |
| parent | clk: divider: fix incorrect usage of container_of (diff) | |
| download | linux-dev-716d9b1d4a88493ec3e52957cc1026d32534ee67.tar.xz linux-dev-716d9b1d4a88493ec3e52957cc1026d32534ee67.zip | |
Merge branch 'clk-divider-container' into clk-next
* clk-divider-container:
clk: divider: fix incorrect usage of container_of
Plus fixup sprd/div.c to pass the width too.
Diffstat (limited to 'include/linux/clk-provider.h')
| -rw-r--r-- | include/linux/clk-provider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 411db2423bd4..175a62a15619 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -412,7 +412,7 @@ extern const struct clk_ops clk_divider_ro_ops; unsigned long divider_recalc_rate(struct clk_hw *hw, unsigned long parent_rate, unsigned int val, const struct clk_div_table *table, - unsigned long flags); + unsigned long flags, unsigned long width); long divider_round_rate_parent(struct clk_hw *hw, struct clk_hw *parent, unsigned long rate, unsigned long *prate, const struct clk_div_table *table, |