diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 12:18:03 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 13:26:40 -0700 |
| commit | 85e88fab134d8896cf4d8be0aac10cc54018ee63 (patch) | |
| tree | cc0a6dab17bfc06837c8f6f1e1763f9490dec60e /include | |
| parent | ddfb157444e3cdb6da18ea759730b4b4af65d3d9 (diff) | |
| parent | 8eb92ab68f961bb9045d8d7882cceb2d6be0659d (diff) | |
| download | linux-stable-85e88fab134d8896cf4d8be0aac10cc54018ee63.tar.gz linux-stable-85e88fab134d8896cf4d8be0aac10cc54018ee63.tar.bz2 linux-stable-85e88fab134d8896cf4d8be0aac10cc54018ee63.zip | |
Merge branch 'clk-exynos-cpu-clk' into clk-next
Folded into this merge commit is a build error fix: s/clk/core in
clk_change_rate due to the new struct clk_core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/clk-provider.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 4a943d13625b..6a24df64b0a0 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -31,6 +31,7 @@ #define CLK_GET_RATE_NOCACHE BIT(6) /* do not use the cached clk rate */ #define CLK_SET_RATE_NO_REPARENT BIT(7) /* don't re-parent on rate change */ #define CLK_GET_ACCURACY_NOCACHE BIT(8) /* do not use the cached clk accuracy */ +#define CLK_RECALC_NEW_RATES BIT(9) /* recalc rates after notifications */ struct clk_hw; struct clk_core; |