diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-08 18:42:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-08 18:42:42 +0200 |
| commit | 4ece0b30ac3a6afffc45ba9f47eb0d9d2361d6a5 (patch) | |
| tree | 0d9167fd3e34842ca7f817b2020a4070a62cdefc /Documentation/watchdog | |
| parent | 68cb4b7f9eafb1886b4f46c0d2ea9eb321b76831 (diff) | |
| parent | 7645054f181404e6a28c616b307c4d2562423a50 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'Documentation/watchdog')
| -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) |