diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /drivers/char/watchdog/sbc8360.c | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/char/watchdog/sbc8360.c')
| -rw-r--r-- | drivers/char/watchdog/sbc8360.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/sbc8360.c b/drivers/char/watchdog/sbc8360.c index 1035be5b501..41fc6f80c49 100644 --- a/drivers/char/watchdog/sbc8360.c +++ b/drivers/char/watchdog/sbc8360.c @@ -200,7 +200,7 @@ static int wd_margin = 0xB; static int wd_multiplier = 2; static int nowayout = WATCHDOG_NOWAYOUT; -module_param(timeout, int, 27); +module_param(timeout, int, 0); MODULE_PARM_DESC(timeout, "Index into timeout table (0-63) (default=27 (60s))"); module_param(nowayout, int, 0); MODULE_PARM_DESC(nowayout, @@ -407,7 +407,7 @@ module_exit(sbc8360_exit); MODULE_AUTHOR("Ian E. Morgan <imorgan@webcon.ca>"); MODULE_DESCRIPTION("SBC8360 watchdog driver"); MODULE_LICENSE("GPL"); -MODULE_VERSION("1.0"); +MODULE_VERSION("1.01"); MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); /* end of sbc8360.c */ |