diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:45 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-01-13 12:01:45 +0800 |
commit | 99d4c5fe0b7838de15c59b375491ef075848d92d (patch) | |
tree | cba6c9b016ba99c3f163b9c3d6338dce95d868cc /drivers/clk/imx/clk-imx31.c | |
parent | f02e043c5ee3014ba0fbae38e699008385c99d7b (diff) | |
parent | 49c4446a2e13b3e4ff2d953ca8e2d961964d0351 (diff) |
Merge tag 'v4.4.42' into linux-linaro-lsk-v4.4
This is the 4.4.42 stable release
Diffstat (limited to 'drivers/clk/imx/clk-imx31.c')
-rw-r--r-- | drivers/clk/imx/clk-imx31.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c index 6a964144a5b5..6a49ba2b9671 100644 --- a/drivers/clk/imx/clk-imx31.c +++ b/drivers/clk/imx/clk-imx31.c @@ -157,10 +157,8 @@ static void __init _mx31_clocks_init(unsigned long fref) } } -int __init mx31_clocks_init(void) +int __init mx31_clocks_init(unsigned long fref) { - u32 fref = 26000000; /* default */ - _mx31_clocks_init(fref); clk_register_clkdev(clk[gpt_gate], "per", "imx-gpt.0"); |