diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:57:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-01 19:57:13 -0500 |
commit | cf78031a659c05905f817f398df8e749dcd6e75d (patch) | |
tree | e2d6673337bbc27faf36bb0c233fc28eb1a17117 /drivers/clk/tegra/clk.c | |
parent | 1826907c1f591f820748d33ac77736fe42d18a08 (diff) | |
parent | 2aac7ddf9a410e3418c9cc69618f304550466793 (diff) | |
download | linux-stable-cf78031a659c05905f817f398df8e749dcd6e75d.tar.gz linux-stable-cf78031a659c05905f817f398df8e749dcd6e75d.tar.bz2 linux-stable-cf78031a659c05905f817f398df8e749dcd6e75d.zip |
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd:
"A handful of const updates for reset ops and a couple fixes to the
newly introduced IPQ4019 clock driver"
* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: qcom: ipq4019: add some fixed clocks for ddrppl and fepll
clk: qcom: ipq4019: switch remaining defines to enums
clk: qcom: Make reset_control_ops const
clk: tegra: Make reset_control_ops const
clk: sunxi: Make reset_control_ops const
clk: atlas7: Make reset_control_ops const
clk: rockchip: Make reset_control_ops const
clk: mmp: Make reset_control_ops const
clk: mediatek: Make reset_control_ops const
Diffstat (limited to 'drivers/clk/tegra/clk.c')
-rw-r--r-- | drivers/clk/tegra/clk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c index 2a3a4fe803d6..f60fe2e344ca 100644 --- a/drivers/clk/tegra/clk.c +++ b/drivers/clk/tegra/clk.c @@ -271,7 +271,7 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl, } } -static struct reset_control_ops rst_ops = { +static const struct reset_control_ops rst_ops = { .assert = tegra_clk_rst_assert, .deassert = tegra_clk_rst_deassert, }; |