diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 16:10:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-13 16:10:08 -0800 |
| commit | 58a3bb59973e33a428d72fa530a3d1d81feb0e8f (patch) | |
| tree | 11a6f4838ec20d96bc287a62f21c4b10f0c86b1a /drivers/char/watchdog/smsc37b787_wdt.c | |
| parent | 7f1f86a0d04e79f8165e6f50d329a520b8cd11e5 (diff) | |
| parent | 88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d (diff) | |
| download | op-kernel-dev-58a3bb59973e33a428d72fa530a3d1d81feb0e8f.zip op-kernel-dev-58a3bb59973e33a428d72fa530a3d1d81feb0e8f.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (23 commits)
[WATCHDOG] timers cleanup
[WATCHDOG] ib700wdt.c - convert to platform_device part 2
[WATCHDOG] ib700wdt.c - convert to platform_device
[WATCHDOG] ib700wdt.c spinlock/WDIOC_SETOPTIONS changes
[WATCHDOG] ib700wdt.c small clean-up's
[WATCHDOG] ib700wdt.c clean-up init and exit routines
[WATCHDOG] ib700_wdt.c stop + set_heartbeat operations
[WATCHDOG] show default value for nowayout in module parameter
[WATCHDOG] advantechwdt.c - convert to platform_device part 2
[WATCHDOG] advantechwdt.c - convert to platform_device
[WATCHDOG] advantechwdt.c - move set_heartbeat to a seperate function
[WATCHDOG] advantechwdt.c - cleanup before platform_device patches
[WATCHDOG] acquirewdt.c - convert to platform_device part 2
[WATCHDOG] acquirewdt.c - convert to platform_device
[WATCHDOG] acquirewdt.c - clean before platform_device patches
[WATCHDOG] pcwd_usb.c - get heartbeat from dip switches
[WATCHDOG] pcwd.c - e-mail adres update
[WATCHDOG] pcwd_usb.c - get heartbeat from dip switches
[WATCHDOG] pcwd_usb.c - document includes
[WATCHDOG] pcwd_pci.c - spinlock fixes
...
Diffstat (limited to 'drivers/char/watchdog/smsc37b787_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/smsc37b787_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/smsc37b787_wdt.c b/drivers/char/watchdog/smsc37b787_wdt.c index a9681d5..d3cb0a7 100644 --- a/drivers/char/watchdog/smsc37b787_wdt.c +++ b/drivers/char/watchdog/smsc37b787_wdt.c @@ -624,4 +624,4 @@ module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "range is 1-255 units, default is 60"); module_param(nowayout, int, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
