brcm47xx: watchdog: deactivate NOWAYOUT.

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-3.6 / 542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch

diff --git a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
index 54956fd2d7e74cd094f43981a116bae61441d39c..8d85303e4b2fc2d3c01053125b566eb4589c668d 100644 (file)
--- a/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
+++ b/target/linux/brcm47xx/patches-3.6/542-watchdog-bcm47xx_wdt.c-rename-ops-methods.patch
@@ -1,8 +1,8 @@
 --- a/drivers/watchdog/bcm47xx_wdt.c
 +++ b/drivers/watchdog/bcm47xx_wdt.c
-@@ -46,12 +46,13 @@ MODULE_PARM_DESC(nowayout,
+@@ -44,12 +44,13 @@ MODULE_PARM_DESC(nowayout,
+               "Watchdog cannot be stopped once started (default="
                                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
- #endif
  
 +
  static inline struct bcm47xx_wdt *bcm47xx_wdt_get(struct watchdog_device *wdd)
@@ -15,7 +15,7 @@
  {
        struct bcm47xx_wdt *wdt = (struct bcm47xx_wdt *)data;
        u32 next_tick = min(wdt->wdd.timeout * 1000, wdt->max_timer_ms);
-@@ -64,7 +65,7 @@ static void bcm47xx_timer_tick(unsigned
+@@ -62,7 +63,7 @@ static void bcm47xx_timer_tick(unsigned
        }
  }
  
@@ -24,7 +24,7 @@
  {
        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
  
-@@ -73,17 +74,17 @@ static int bcm47xx_wdt_keepalive(struct
+@@ -71,17 +72,17 @@ static int bcm47xx_wdt_keepalive(struct
        return 0;
  }
  
@@ -46,7 +46,7 @@
  {
        struct bcm47xx_wdt *wdt = bcm47xx_wdt_get(wdd);
  
-@@ -93,8 +94,8 @@ static int bcm47xx_wdt_stop(struct watch
+@@ -91,8 +92,8 @@ static int bcm47xx_wdt_stop(struct watch
        return 0;
  }
  
@@ -57,7 +57,7 @@
  {
        if (new_time < 1 || new_time > WDT_MAX_TIME) {
                pr_warn("timeout value must be 1<=x<=%d, using %d\n",
-@@ -124,12 +125,12 @@ static int bcm47xx_wdt_notify_sys(struct
+@@ -122,12 +123,12 @@ static int bcm47xx_wdt_notify_sys(struct
        return NOTIFY_DONE;
  }
  
@@ -75,7 +75,7 @@
  };
  
  static int __devinit bcm47xx_wdt_probe(struct platform_device *pdev)
-@@ -140,10 +141,10 @@ static int __devinit bcm47xx_wdt_probe(s
+@@ -138,10 +139,10 @@ static int __devinit bcm47xx_wdt_probe(s
        if (!wdt)
                return -ENXIO;