kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 106-dt-sun7i-add-arch-timer-node.patch

diff --git a/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch b/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
index 4ded898bbf7333da5758d4824f837ed4ff077143..386f04295c4605a688d057b9399134a3f7889586 100644 (file)
--- a/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
+++ b/target/linux/sunxi/patches-3.14/106-dt-sun7i-add-arch-timer-node.patch
@@ -12,8 +12,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 822a816..911d4e4 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
 @@ -49,6 +49,14 @@
@@ -31,6 +29,3 @@ index 822a816..911d4e4 100644
        clocks {
                #address-cells = <1>;
                #size-cells = <1>;
--- 
-2.0.3
-