From 6be2305da83471c442dab83366c25be4dfb38793 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Fri, 14 Aug 2015 13:06:33 +0000
Subject: kernel: update 4.1 to 4.1.5

Changelog:
 * https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.5

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46598
---
 target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch')

diff --git a/target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch b/target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch
index 8500e9d..43997e1 100644
--- a/target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch
+++ b/target/linux/sunxi/patches-4.1/167-1-dt-sun7i-add-codec-node.patch
@@ -11,11 +11,9 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  arch/arm/boot/dts/sun7i-a20.dtsi | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
-index 1cced70..a99bbae 100644
 --- a/arch/arm/boot/dts/sun7i-a20.dtsi
 +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
-@@ -1214,6 +1214,18 @@
+@@ -1182,6 +1182,18 @@
  			status = "disabled";
  		};
  
-- 
cgit v1.1