From 098f187e7870684bfaaa53a1fdfc9682cc1e0dae 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch') diff --git a/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch b/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch index b948c203ae..2464408805 100644 --- a/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch +++ b/target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch @@ -1,10 +1,8 @@ -diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts -index b3c234c..fd1e921 100644 --- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts -@@ -155,3 +155,62 @@ - status = "okay"; - }; +@@ -189,3 +189,62 @@ + status = "okay"; + }; }; +&nfc { + pinctrl-names = "default"; -- cgit v1.2.3