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/018-normalize_pinctrl_entries_for_armada_socs.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/018-normalize_pinctrl_entries_for_armada_socs.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch b/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch index e8f9d308cb..ca7b13bed4 100644 --- a/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch +++ b/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch @@ -69,7 +69,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> }; --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi -@@ -212,7 +212,7 @@ +@@ -220,7 +220,7 @@ }; &pinctrl { @@ -78,7 +78,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", -@@ -223,7 +223,7 @@ +@@ -231,7 +231,7 @@ marvell,function = "ge0"; }; @@ -87,7 +87,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", -@@ -231,7 +231,7 @@ +@@ -239,7 +239,7 @@ marvell,function = "ge0"; }; |