From 6be2305da83471c442dab83366c25be4dfb38793 Mon Sep 17 00:00:00 2001 From: Jonas Gorski 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 SVN-Revision: 46598 --- target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch') diff --git a/target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch b/target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch index b1a9b07402..ff8e093c49 100644 --- a/target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch +++ b/target/linux/sunxi/patches-4.1/126-4-dt-sun4i-add-nfc-to-a10.patch @@ -11,11 +11,9 @@ Signed-off-by: Hans de Goede arch/arm/boot/dts/sun7i-a20.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) -diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi -index 6ec86c9..092adc6 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi -@@ -641,6 +641,17 @@ +@@ -543,6 +543,17 @@ #dma-cells = <2>; }; -- cgit v1.2.3