diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-14 13:06:33 +0000 |
| commit | 098f187e7870684bfaaa53a1fdfc9682cc1e0dae (patch) | |
| tree | e4f67db9483b1ce0d774fc67ab46a18171579338 /target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch | |
| parent | bbf13d61b7377b5114d9c716b7326f3f2bc468c1 (diff) | |
| download | master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.gz master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.tar.bz2 master-187ad058-098f187e7870684bfaaa53a1fdfc9682cc1e0dae.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46598 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.1/127-4-dt-sun4i-enable-nand-on-a10-lime.patch | 8 |
1 files changed, 3 insertions, 5 deletions
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"; |