diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /Documentation/watchdog/watchdog-parameters.txt | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'Documentation/watchdog/watchdog-parameters.txt')
| -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) |