kernel: update 3.18 to 3.18.16

[15.05/openwrt.git] / target / linux / mvebu / patches-3.18 / 011-use_pinctrl_node_alias.patch

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 2069c88..d10e092 100644 (file)
--- 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 @@
                };
        };
  };