* [PATCH] watchdog docs: add an entry for imx2_wdt
@ 2010-06-24 16:43 Fabio Estevam
2010-06-25 7:18 ` Wolfram Sang
0 siblings, 1 reply; 2+ messages in thread
From: Fabio Estevam @ 2010-06-24 16:43 UTC (permalink / raw)
To: linux-kernel; +Cc: wim, rdunlap, s.hauer, w.sang
Add an entry for imx2_wdt in watchdog-parameters.txt
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
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 41c95cc..17ddd82 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)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] watchdog docs: add an entry for imx2_wdt
2010-06-24 16:43 [PATCH] watchdog docs: add an entry for imx2_wdt Fabio Estevam
@ 2010-06-25 7:18 ` Wolfram Sang
0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2010-06-25 7:18 UTC (permalink / raw)
To: Fabio Estevam; +Cc: linux-kernel, wim, rdunlap, s.hauer
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
On Thu, Jun 24, 2010 at 09:43:25AM -0700, Fabio Estevam wrote:
> Add an entry for imx2_wdt in watchdog-parameters.txt
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Thanks!
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-25 7:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-24 16:43 [PATCH] watchdog docs: add an entry for imx2_wdt Fabio Estevam
2010-06-25 7:18 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).