diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 10:38:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-12 10:38:54 +0000 |
| commit | 3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a (patch) | |
| tree | f86f2af80dce91290a0aad8daaa8ed5c38733d35 /target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch | |
| parent | 902dc6b2c8c653cba0c4726cffa81481f0e82032 (diff) | |
| download | master-187ad058-3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a.tar.gz master-187ad058-3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a.tar.bz2 master-187ad058-3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46303 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 @@ }; }; }; |