mvebu: make patches apply against 3.18.18 again

[openwrt/staging/chunkeey.git] / target / linux / mvebu / patches-3.18 / 015-move_armada_370_xp_pinctrl_node_definition.patch

diff --git a/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch b/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch
index 5259e05ccbbade66a1e51336de02ef92f7c06d34..ed36d680eb2ec02313992a94e6446b5a4b83129d 100644 (file)
--- a/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch
+++ b/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch
@@ -387,7 +387,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
                        gpio0: gpio@18100 {
                                compatible = "marvell,orion-gpio";
                                reg = <0x18100 0x40>;
-@@ -306,3 +245,63 @@
+@@ -314,3 +253,63 @@
                };
        };
  };
@@ -497,7 +497,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
                        system-controller@18200 {
                                compatible = "marvell,armada-370-xp-system-controller";
                                reg = <0x18200 0x500>;
-@@ -238,3 +201,38 @@
+@@ -246,3 +209,38 @@
                };
        };
  };