diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 12:37:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 12:37:12 -0400 |
| commit | 9fbd7f9d112e50dc7649d13de37bc92cb50c3905 (patch) | |
| tree | 68a0c7cbe30731c52f7842d09bbf50b3c30a02e7 | |
| parent | bf4f42b441919417386beb2f9c58e802e7de89df (diff) | |
| parent | 476099a1b3950285013dd8df0869df6fceaf6579 (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.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: | |||
| 125 | nowayout: Watchdog cannot be stopped once started | 125 | nowayout: Watchdog cannot be stopped once started |
| 126 | (default=kernel config parameter) | 126 | (default=kernel config parameter) |
| 127 | ------------------------------------------------- | 127 | ------------------------------------------------- |
| 128 | imx2_wdt: | ||
| 129 | timeout: Watchdog timeout in seconds (default 60 s) | ||
| 130 | nowayout: Watchdog cannot be stopped once started | ||
| 131 | (default=kernel config parameter) | ||
| 132 | ------------------------------------------------- | ||
| 128 | indydog: | 133 | indydog: |
| 129 | nowayout: Watchdog cannot be stopped once started | 134 | nowayout: Watchdog cannot be stopped once started |
| 130 | (default=kernel config parameter) | 135 | (default=kernel config parameter) |