diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 22:02:32 -0800 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 22:02:32 -0800 |
| commit | ac98695d6c1508b724f246f38ce57fb4e3cec356 (patch) | |
| tree | 189969a3689b9b83eaf39314a7942cc781ff836b /drivers/char/watchdog/ibmasr.c | |
| parent | d9bc125caf592b7d081021f32ce5b717efdf70c8 (diff) | |
| parent | 93bbad8fe13a25dcf7f3bc628a71d1a7642ae61b (diff) | |
| download | op-kernel-dev-ac98695d6c1508b724f246f38ce57fb4e3cec356.zip op-kernel-dev-ac98695d6c1508b724f246f38ce57fb4e3cec356.tar.gz | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/char/watchdog/ibmasr.c')
| -rw-r--r-- | drivers/char/watchdog/ibmasr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/watchdog/ibmasr.c b/drivers/char/watchdog/ibmasr.c index dd6760f..8195f50 100644 --- a/drivers/char/watchdog/ibmasr.c +++ b/drivers/char/watchdog/ibmasr.c @@ -396,7 +396,7 @@ module_init(ibmasr_init); module_exit(ibmasr_exit); 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) ")"); MODULE_DESCRIPTION("IBM Automatic Server Restart driver"); MODULE_AUTHOR("Andrey Panin"); |
