kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 148-dt-sun7i-add-spi-muxing.patch

diff --git a/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch b/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
index f554267a5ea78123b92a5b1c4f067a6d2ad9516e..0c78fa4bc840eb76442503b449a06ab4a9c4d51f 100644 (file)
--- a/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
+++ b/target/linux/sunxi/patches-3.14/148-dt-sun7i-add-spi-muxing.patch
@@ -8,8 +8,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 0f0ee58..6161fd8 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
 @@ -571,6 +571,20 @@
@@ -33,6 +31,3 @@ index 0f0ee58..6161fd8 100644
                };
  
                timer@01c20c00 {
--- 
-2.0.3
-