diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:30 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-05 10:00:47 +0300 |
| commit | 95cd2ea7d54b41b0b2828587f108fe270d59eede (patch) | |
| tree | 623675092834a6a92ac1ef28cc5abb930c9a11b0 /drivers/clk/qcom/common.c | |
| parent | 66c117d7fa2ae429911e60d84bf31a90b2b96189 (diff) | |
| parent | e713c80a4e49d4bed5324d24755e42bf01c87556 (diff) | |
| download | linux-95cd2ea7d54b41b0b2828587f108fe270d59eede.tar.xz | |
Merge branch 'linus' into x86/urgent, to be able to merge a dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/qcom/common.c')
| -rw-r--r-- | drivers/clk/qcom/common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c index f7101e330b1d..2dedceefd21d 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c @@ -12,6 +12,7 @@ */ #include <linux/export.h> +#include <linux/module.h> #include <linux/regmap.h> #include <linux/platform_device.h> #include <linux/clk-provider.h> @@ -45,7 +46,7 @@ EXPORT_SYMBOL_GPL(qcom_find_freq); int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map, u8 src) { - int i, num_parents = __clk_get_num_parents(hw->clk); + int i, num_parents = clk_hw_get_num_parents(hw); for (i = 0; i < num_parents; i++) if (src == map[i].src) @@ -144,3 +145,5 @@ void qcom_cc_remove(struct platform_device *pdev) reset_controller_unregister(platform_get_drvdata(pdev)); } EXPORT_SYMBOL_GPL(qcom_cc_remove); + +MODULE_LICENSE("GPL v2"); |