kernel: update 3.14 to 3.14.18

[openwrt/openwrt.git] / target / linux / sunxi / patches-3.14 / 155-wdt-add-new-compats.patch

diff --git a/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch b/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
index 16350255228803f84a86ad64216539615a1d54f4..75c444d6d09818e8e5610f28410a574b941aee69 100644 (file)
--- a/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
+++ b/target/linux/sunxi/patches-3.14/155-wdt-add-new-compats.patch
@@ -14,8 +14,6 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  drivers/watchdog/sunxi_wdt.c                             | 1 +
  2 files changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
-index e39cb26..6e8c937 100644
 --- a/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
 +++ b/Documentation/devicetree/bindings/watchdog/sunxi-wdt.txt
 @@ -2,13 +2,14 @@ Allwinner SoCs Watchdog timer
@@ -36,11 +34,9 @@ index e39cb26..6e8c937 100644
 +      compatible = "allwinner,sun4i-a10-wdt";
        reg = <0x01c20c90 0x10>;
  };
-diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c
-index 76332d89..7c8923d 100644
 --- a/drivers/watchdog/sunxi_wdt.c
 +++ b/drivers/watchdog/sunxi_wdt.c
-@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct platform_device *pdev)
+@@ -206,6 +206,7 @@ static void sunxi_wdt_shutdown(struct pl
  
  static const struct of_device_id sunxi_wdt_dt_ids[] = {
        { .compatible = "allwinner,sun4i-wdt" },
@@ -48,6 +44,3 @@ index 76332d89..7c8923d 100644
        { /* sentinel */ }
  };
  MODULE_DEVICE_TABLE(of, sunxi_wdt_dt_ids);
--- 
-2.0.3
-