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 | e5441232a81d01e2ed46d88e340a30fd6b15b012 (patch) | |
tree | e008cc6bd24a0e2c9b283d94a69f7a027bcfb856 /target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch | |
parent | 048910c4e07b6fae28513ce1dea62fe3b6bb03de (diff) | |
download | upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.gz upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.tar.bz2 upstream-e5441232a81d01e2ed46d88e340a30fd6b15b012.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42463 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch')
-rw-r--r-- | target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch b/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch index 6ac1a7e8f9..235550b47d 100644 --- a/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch +++ b/target/linux/sunxi/patches-3.14/156-dt-sunxi-update-wdt-compats.patch @@ -16,11 +16,9 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi -index 3ce650b..4b90a18 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi -@@ -597,7 +597,7 @@ +@@ -487,7 +487,7 @@ }; wdt: watchdog@01c20c90 { @@ -29,11 +27,9 @@ index 3ce650b..4b90a18 100644 reg = <0x01c20c90 0x10>; }; -diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi -index 1795c26..45300a6 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi -@@ -508,7 +508,7 @@ +@@ -392,7 +392,7 @@ }; wdt: watchdog@01c20c90 { @@ -42,11 +38,9 @@ index 1795c26..45300a6 100644 reg = <0x01c20c90 0x10>; }; -diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi -index 8bc8e14..280ffee 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi -@@ -454,7 +454,7 @@ +@@ -393,7 +393,7 @@ }; wdt: watchdog@01c20c90 { @@ -55,8 +49,6 @@ index 8bc8e14..280ffee 100644 reg = <0x01c20c90 0x10>; }; -diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi -index e4267bd..8441733 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -289,7 +289,7 @@ @@ -68,11 +60,9 @@ index e4267bd..8441733 100644 reg = <0x01c20ca0 0x20>; }; -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 30b9aba..4981f5e 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi -@@ -725,7 +725,7 @@ +@@ -608,7 +608,7 @@ }; wdt: watchdog@01c20c90 { @@ -81,6 +71,3 @@ index 30b9aba..4981f5e 100644 reg = <0x01c20c90 0x10>; }; --- -2.0.3 - |