projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'linux-watchdog-5.4-rc1' of git://www.linux-watchdog.org/linux-watchdog
[linux-2.6-microblaze.git]
/
Documentation
/
watchdog
/
watchdog-parameters.rst
diff --git
a/Documentation/watchdog/watchdog-parameters.rst
b/Documentation/watchdog/watchdog-parameters.rst
index
a3985cc
..
223c993
100644
(file)
--- a/
Documentation/watchdog/watchdog-parameters.rst
+++ b/
Documentation/watchdog/watchdog-parameters.rst
@@
-301,15
+301,6
@@
ixp4xx_wdt:
-------------------------------------------------
-------------------------------------------------
-ks8695_wdt:
- wdt_time:
- Watchdog time in seconds. (default=5)
- nowayout:
- Watchdog cannot be stopped once started
- (default=kernel config parameter)
-
--------------------------------------------------
-
machzwd:
nowayout:
Watchdog cannot be stopped once started
machzwd:
nowayout:
Watchdog cannot be stopped once started
@@
-375,16
+366,6
@@
nic7018_wdt:
-------------------------------------------------
-------------------------------------------------
-nuc900_wdt:
- heartbeat:
- Watchdog heartbeats in seconds.
- (default = 15)
- nowayout:
- Watchdog cannot be stopped once started
- (default=kernel config parameter)
-
--------------------------------------------------
-
omap_wdt:
timer_margin:
initial watchdog timeout (in seconds)
omap_wdt:
timer_margin:
initial watchdog timeout (in seconds)