summaryrefslogtreecommitdiffstats
path: root/Documentation/watchdog
diff options
context:
space:
mode:
authorLars Poeschel <poeschel@lemonage.de>2015-06-17 11:13:27 +0200
committerWim Van Sebroeck <wim@iguana.be>2015-06-22 15:54:36 +0200
commita47911e99fe8d2080426951711a7e776d331ba77 (patch)
treeb2009c8d61d774ddf8eb8d8d45010e1b056ad411 /Documentation/watchdog
parent452fafed839eb008a8ed9072d63449cb76de617e (diff)
downloadlinux-stable-a47911e99fe8d2080426951711a7e776d331ba77.tar.gz
linux-stable-a47911e99fe8d2080426951711a7e776d331ba77.tar.bz2
linux-stable-a47911e99fe8d2080426951711a7e776d331ba77.zip
watchdog: docs: omap_wdt also understands nowayout
The omap_wdt kernel driver also understands the nowayout module parameter. This updates the watchdog-parameters.txt to reflect this fact. Signed-off-by: Lars Poeschel <poeschel@lemonage.de> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'Documentation/watchdog')
-rw-r--r--Documentation/watchdog/watchdog-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 692791cc674c..74252c431e05 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -208,6 +208,8 @@ nowayout: Watchdog cannot be stopped once started
-------------------------------------------------
omap_wdt:
timer_margin: initial watchdog timeout (in seconds)
+nowayout: Watchdog cannot be stopped once started
+ (default=kernel config parameter)
-------------------------------------------------
orion_wdt:
heartbeat: Initial watchdog heartbeat in seconds