From 3e2db40f4a5fd747bcd3dd3c79ef06c82a001f3a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 12 Jul 2015 10:38:54 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46303 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch') diff --git a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch b/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch index 668d55dd07..9085db00d2 100644 --- a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch +++ b/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch @@ -54,7 +54,7 @@ Signed-off-by: Jason Cooper i2c0: i2c@11000 { compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; reg = <0x11000 0x100>; -@@ -240,6 +245,12 @@ +@@ -248,6 +253,12 @@ marvell,function = "sd0"; }; -- cgit v1.2.3