kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 120-dt-sun7i-add-gmac-clocknode.patch

diff --git a/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch b/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
index 47dab70c6901e6ff6f41ed0a3ce85ba0ce6997c6..9a1e485fd8a13b94263119fb27fc8d1b7bac4493 100644 (file)
--- a/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
+++ b/target/linux/sunxi/patches-3.14/120-dt-sun7i-add-gmac-clocknode.patch
@@ -12,11 +12,9 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  arch/arm/boot/dts/sun7i-a20.dtsi | 28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 78f562a..f6ae357 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -322,6 +322,34 @@
+@@ -330,6 +330,34 @@
                };
  
                /*
@@ -51,6 +49,3 @@ index 78f562a..f6ae357 100644
                 * Dummy clock used by output clocks
                 */
                osc24M_32k: clk@1 {
--- 
-2.0.3
-