aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2015-07-12 10:38:54 +0000
committerHauke Mehrtens <hauke@openwrt.org>2015-07-12 10:38:54 +0000
commit3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a (patch)
treef86f2af80dce91290a0aad8daaa8ed5c38733d35 /target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
parent902dc6b2c8c653cba0c4726cffa81481f0e82032 (diff)
downloadmaster-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/016-common_armada_xp_uart2_3_pinctrl.patch')
-rw-r--r--target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
index 2d289706ad..4cccdb3b97 100644
--- a/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
+++ b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch
@@ -35,7 +35,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net>
reg = <0x12300 0x100>;
reg-shift = <2>;
interrupts = <44>;
-@@ -235,4 +239,14 @@
+@@ -243,4 +247,14 @@
"mpp33", "mpp34", "mpp35";
marvell,function = "sd0";
};