kernel: update 3.18 to 3.18.14

[openwrt/svn-archive/archive.git] / target / linux / mvebu / patches-3.18 / 198-gpio_mvebu_suspend.patch

diff --git a/target/linux/mvebu/patches-3.18/198-gpio_mvebu_suspend.patch b/target/linux/mvebu/patches-3.18/198-gpio_mvebu_suspend.patch
index 7a5c0b6ba6b69339cc9c91680954421fc8ecb22b..9ef181503581e94f026498d39ae83a8636528ef2 100644 (file)
--- a/target/linux/mvebu/patches-3.18/198-gpio_mvebu_suspend.patch
+++ b/target/linux/mvebu/patches-3.18/198-gpio_mvebu_suspend.patch
@@ -24,7 +24,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  };
  
  /*
-@@ -554,6 +562,93 @@ static const struct of_device_id mvebu_g
+@@ -562,6 +570,93 @@ static const struct of_device_id mvebu_g
  };
  MODULE_DEVICE_TABLE(of, mvebu_gpio_of_match);
  
@@ -118,7 +118,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  static int mvebu_gpio_probe(struct platform_device *pdev)
  {
        struct mvebu_gpio_chip *mvchip;
-@@ -577,6 +672,8 @@ static int mvebu_gpio_probe(struct platf
+@@ -585,6 +680,8 @@ static int mvebu_gpio_probe(struct platf
        if (!mvchip)
                return -ENOMEM;
  
@@ -127,7 +127,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
        if (of_property_read_u32(pdev->dev.of_node, "ngpios", &ngpios)) {
                dev_err(&pdev->dev, "Missing ngpios OF property\n");
                return -ENODEV;
-@@ -735,5 +832,7 @@ static struct platform_driver mvebu_gpio
+@@ -743,5 +840,7 @@ static struct platform_driver mvebu_gpio
                .of_match_table = mvebu_gpio_of_match,
        },
        .probe          = mvebu_gpio_probe,