aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
committerJonas Gorski <jogo@openwrt.org>2015-06-17 09:54:55 +0000
commit9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6 (patch)
tree3c4aef6e759fbdd74af7f5e14a495f531dc88515 /target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
parente952654f0b002e6494cfdb705ee8f0646798dd6c (diff)
downloadupstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.gz
upstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.tar.bz2
upstream-9a59b350b7587eae4bcf6091b4dc86a4ee92bcf6.zip
kernel: update 3.18 to 3.18.16
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16 Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46011
Diffstat (limited to 'target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch')
-rw-r--r--target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch b/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
index 2069c882d5..d10e09269a 100644
--- a/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
+++ b/target/linux/mvebu/patches-3.18/011-use_pinctrl_node_alias.patch
@@ -231,7 +231,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
+};
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
-@@ -77,12 +77,7 @@
+@@ -81,12 +81,7 @@
serial@12100 {
status = "okay";
};
@@ -245,7 +245,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
leds {
compatible = "gpio-leds";
pinctrl-names = "default";
-@@ -187,3 +182,10 @@
+@@ -191,3 +186,10 @@
};
};
};