aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 09:37:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 09:37:12 -0700
commit9fbd7f9d112e50dc7649d13de37bc92cb50c3905 (patch)
tree68a0c7cbe30731c52f7842d09bbf50b3c30a02e7
parentbf4f42b441919417386beb2f9c58e802e7de89df (diff)
parent476099a1b3950285013dd8df0869df6fceaf6579 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: watchdog: docs: add an entry for imx2_wdt
-rw-r--r--Documentation/watchdog/watchdog-parameters.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 41c95cc1dc1..17ddd822b45 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -125,6 +125,11 @@ ibmasr:
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)
-------------------------------------------------
+imx2_wdt:
+timeout: Watchdog timeout in seconds (default 60 s)
+nowayout: Watchdog cannot be stopped once started
+ (default=kernel config parameter)
+-------------------------------------------------
indydog:
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)