CC: kernel: update 3.18 to 3.18.18

[15.05/openwrt.git] / 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 668d55d..9085db0 100644 (file)
--- 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 <jason@lakedaemon.net>
                        i2c0: i2c@11000 {
                                compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
                                reg = <0x11000 0x100>;
-@@ -240,6 +245,12 @@
+@@ -248,6 +253,12 @@
                marvell,function = "sd0";
        };