diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
| commit | 3985b18650bf2365debb142624f877007b31ada2 (patch) | |
| tree | ac8910bfd2e800ac840c93ae84013e5b1f2cd19d /drivers/clk/qcom/common.h | |
| parent | 5b6d12b532bb2e4f114d8a2904eaac1ece43ea20 (diff) | |
| parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linarotracking-ll-linux-linaro-extra-20151104.0ll-20151022.1linux-linaro-4.3-rc6-2015.10ll_20151022.1
Conflicting files:
Diffstat (limited to 'drivers/clk/qcom/common.h')
| -rw-r--r-- | drivers/clk/qcom/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h index 7a0e73713063..2892b71fbd71 100644 --- a/drivers/clk/qcom/common.h +++ b/drivers/clk/qcom/common.h @@ -28,6 +28,8 @@ struct qcom_cc_desc { size_t num_clks; const struct qcom_reset_map *resets; size_t num_resets; + struct gdsc **gdscs; + size_t num_gdscs; }; extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, |