Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (9fbd7f9d) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/watchdog/watchdog-parameters.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -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)