diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-03 10:54:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-03 10:54:08 -0400 |
| commit | 37e27e36bc416b07d853d493e6818d6a785507a2 (patch) | |
| tree | bb7a5f5f187dace341878e9e2d638550dd0ea102 /drivers | |
| parent | 973bec34bfc1bc2465646181653d67f767d418c8 (diff) | |
| parent | d557f651b3617b46ed18d5bac48a851df1dbf684 (diff) | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/ep93xx_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c index 88ed54e50f74..59359c9a5e01 100644 --- a/drivers/watchdog/ep93xx_wdt.c +++ b/drivers/watchdog/ep93xx_wdt.c | |||
| @@ -244,7 +244,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started"); | |||
| 244 | module_param(timeout, int, 0); | 244 | module_param(timeout, int, 0); |
| 245 | MODULE_PARM_DESC(timeout, | 245 | MODULE_PARM_DESC(timeout, |
| 246 | "Watchdog timeout in seconds. (1<=timeout<=3600, default=" | 246 | "Watchdog timeout in seconds. (1<=timeout<=3600, default=" |
| 247 | __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); | 247 | __MODULE_STRING(WDT_TIMEOUT) ")"); |
| 248 | 248 | ||
| 249 | MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," | 249 | MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>," |
| 250 | "Alessandro Zummo <a.zummo@towertech.it>"); | 250 | "Alessandro Zummo <a.zummo@towertech.it>"); |