diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
commit | 7c7e5c4276090357f57d9a43ba0d25a167b2a83c (patch) | |
tree | 4935c53a401a00be6a8092cfadfc2a69cef47df4 /target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch | |
parent | b2314679b639ddc338ef69d27ce4d959b250f754 (diff) | |
download | master-31e0f0ae-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.gz master-31e0f0ae-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.bz2 master-31e0f0ae-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.zip |
mvebu: make patches apply against 3.18.18 again
commit r46299 broke the mvebu target because one patch does not apply
any more. This commit closes #20070.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46303
Diffstat (limited to 'target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch')
-rw-r--r-- | target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch | 4 |
1 files changed, 2 insertions, 2 deletions
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 5259e05ccb..ed36d680eb 100644 --- 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 @@ }; }; }; |