kernel: update 3.14 to 3.14.18

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

diff --git a/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch b/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
index bf2d3843256bcd0ce80b1496d990a1efb9a8a65b..3ddb55ec2fc231082433ef365e9d6052b2bef1ae 100644 (file)
--- a/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
+++ b/target/linux/sunxi/patches-3.14/121-dt-sun7i-add-gmac-ctrlnode.patch
@@ -8,11 +8,9 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  arch/arm/boot/dts/sun7i-a20.dtsi | 15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index f6ae357..fa489fe 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -645,6 +645,21 @@
+@@ -653,6 +653,21 @@
                        status = "disabled";
                };
  
@@ -34,6 +32,3 @@ index f6ae357..fa489fe 100644
                hstimer@01c60000 {
                        compatible = "allwinner,sun7i-a20-hstimer";
                        reg = <0x01c60000 0x1000>;
--- 
-2.0.3
-