kernel: update 4.1 to 4.1.5

[openwrt/openwrt.git] / target / linux / sunxi / patches-4.1 / 127-5-dt-sun4i-enable-nand-on-a10-pcduino.patch

diff --git a/target/linux/sunxi/patches-4.1/127-5-dt-sun4i-enable-nand-on-a10-pcduino.patch b/target/linux/sunxi/patches-4.1/127-5-dt-sun4i-enable-nand-on-a10-pcduino.patch
index bb817c1241dde4e4655cb7c0b30bcd91fddeb98d..93eb3ebad77fd99d1adb13e3d715e8ffa214cd7a 100644 (file)
--- a/target/linux/sunxi/patches-4.1/127-5-dt-sun4i-enable-nand-on-a10-pcduino.patch
+++ b/target/linux/sunxi/patches-4.1/127-5-dt-sun4i-enable-nand-on-a10-pcduino.patch
@@ -1,10 +1,8 @@
-diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
-index b3c234c..fd1e921 100644
 --- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
 +++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
-@@ -155,3 +155,62 @@
-               status = "okay";
-       };
+@@ -194,3 +194,62 @@
+               status = "okay";
+       };
  };
 +&nfc {
 +              pinctrl-names = "default";