Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e27e36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: ep93xx_wdt.c fix default timout value in MODULE_PARM_DESC string.
parents 973bec34 d557f651

drivers/watchdog/ep93xx_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); 
module_param(timeout, int, 0);

MODULE_PARM_DESC(timeout,

	"Watchdog timeout in seconds. (1<=timeout<=3600, default="

				__MODULE_STRING(WATCHDOG_TIMEOUT) ")");

				__MODULE_STRING(WDT_TIMEOUT) ")");



MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>,"

		"Alessandro Zummo <a.zummo@towertech.it>");