diff options
author | Michael Turquette <mturquette@linaro.org> | 2014-11-25 02:45:33 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2014-11-25 02:45:33 +0100 |
commit | da57b46010dd8d93aabc4c3e8d11751ac617d914 (patch) | |
tree | 1fe26ac6679ea8e76276da87582fcb95210974ed /include | |
parent | clk: hi3620: Move const initdata into correct code section (diff) | |
parent | clk: pxa: fix pxa27x CCCR bit usage (diff) | |
download | linux-da57b46010dd8d93aabc4c3e8d11751ac617d914.tar.xz linux-da57b46010dd8d93aabc4c3e8d11751ac617d914.zip |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'include')
-rw-r--r-- | include/dt-bindings/clock/qcom,mmcc-apq8084.h | 2 | ||||
-rw-r--r-- | include/linux/clk-provider.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/dt-bindings/clock/qcom,mmcc-apq8084.h b/include/dt-bindings/clock/qcom,mmcc-apq8084.h index a929f86d0ddd..d72b5b35f15e 100644 --- a/include/dt-bindings/clock/qcom,mmcc-apq8084.h +++ b/include/dt-bindings/clock/qcom,mmcc-apq8084.h @@ -60,7 +60,7 @@ #define ESC1_CLK_SRC 43 #define HDMI_CLK_SRC 44 #define VSYNC_CLK_SRC 45 -#define RBCPR_CLK_SRC 46 +#define MMSS_RBCPR_CLK_SRC 46 #define RBBMTIMER_CLK_SRC 47 #define MAPLE_CLK_SRC 48 #define VDP_CLK_SRC 49 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index be21af149f11..2839c639f092 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -352,7 +352,6 @@ struct clk_divider { #define CLK_DIVIDER_READ_ONLY BIT(5) extern const struct clk_ops clk_divider_ops; -extern const struct clk_ops clk_divider_ro_ops; struct clk *clk_register_divider(struct device *dev, const char *name, const char *parent_name, unsigned long flags, void __iomem *reg, u8 shift, u8 width, |