diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/hwmon/w83793.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/hwmon/w83793.c')
| -rw-r--r-- | drivers/hwmon/w83793.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 834e49d1827b..d6b0bdd48651 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
| @@ -71,8 +71,8 @@ MODULE_PARM_DESC(timeout, | |||
| 71 | "Watchdog timeout in minutes. 2<= timeout <=255 (default=" | 71 | "Watchdog timeout in minutes. 2<= timeout <=255 (default=" |
| 72 | __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); | 72 | __MODULE_STRING(WATCHDOG_TIMEOUT) ")"); |
| 73 | 73 | ||
| 74 | static int nowayout = WATCHDOG_NOWAYOUT; | 74 | static bool nowayout = WATCHDOG_NOWAYOUT; |
| 75 | module_param(nowayout, int, 0); | 75 | module_param(nowayout, bool, 0); |
| 76 | MODULE_PARM_DESC(nowayout, | 76 | MODULE_PARM_DESC(nowayout, |
| 77 | "Watchdog cannot be stopped once started (default=" | 77 | "Watchdog cannot be stopped once started (default=" |
| 78 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 78 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |