diff options
author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch | |
parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
download | upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch b/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch index 53f2217247..777dfde856 100644 --- a/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch +++ b/target/linux/sunxi/patches-3.14/182-clk-sunxi-get-divs-parent-clockname.patch @@ -19,11 +19,9 @@ Signed-off-by: Emilio López <emilio@elopez.com.ar> drivers/clk/sunxi/clk-sunxi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c -index 7a2ed98..736fb60 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c -@@ -869,7 +869,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, +@@ -940,7 +940,7 @@ static void __init sunxi_divs_clk_setup( struct divs_data *data) { struct clk_onecell_data *clk_data; @@ -32,7 +30,7 @@ index 7a2ed98..736fb60 100644 const char *clk_name; struct clk **clks, *pclk; struct clk_hw *gate_hw, *rate_hw; -@@ -883,6 +883,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, +@@ -954,6 +954,7 @@ static void __init sunxi_divs_clk_setup( /* Set up factor clock that we will be dividing */ pclk = sunxi_factors_clk_setup(node, data->factors); @@ -40,6 +38,3 @@ index 7a2ed98..736fb60 100644 reg = of_iomap(node, 0); --- -2.0.3 - |