diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-02-02 14:59:38 -0800 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-02-02 14:59:38 -0800 |
| commit | 54eea32f7ed3037c91853924227585b65df909a8 (patch) | |
| tree | 4e3e9ece8a66f611e980ddc503ca7184db8f83fb /drivers/clk/sunxi/clk-factors.h | |
| parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
| parent | b530e7d2108a871279dcf707d9d15a3358767d2b (diff) | |
Merge branch 'clk-next' into v3.19-rc7
Diffstat (limited to 'drivers/clk/sunxi/clk-factors.h')
| -rw-r--r-- | drivers/clk/sunxi/clk-factors.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/clk/sunxi/clk-factors.h b/drivers/clk/sunxi/clk-factors.h index 912238fde132..171085ab5513 100644 --- a/drivers/clk/sunxi/clk-factors.h +++ b/drivers/clk/sunxi/clk-factors.h @@ -36,8 +36,9 @@ struct clk_factors { spinlock_t *lock; }; -struct clk * __init sunxi_factors_register(struct device_node *node, - const struct factors_data *data, - spinlock_t *lock); +struct clk *sunxi_factors_register(struct device_node *node, + const struct factors_data *data, + spinlock_t *lock, + void __iomem *reg); #endif |