diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 09:37:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 09:37:12 -0700 |
| commit | 9fbd7f9d112e50dc7649d13de37bc92cb50c3905 (patch) | |
| tree | 68a0c7cbe30731c52f7842d09bbf50b3c30a02e7 | |
| parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
| parent | watchdog: docs: add an entry for imx2_wdt (diff) | |
| download | linux-dev-9fbd7f9d112e50dc7649d13de37bc92cb50c3905.tar.xz linux-dev-9fbd7f9d112e50dc7649d13de37bc92cb50c3905.zip | |
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.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 41c95cc1dc1f..17ddd822b456 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) |