diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-10 14:30:45 -0400 |
| commit | 06eb4eafbdc0796d741d139a44f1253278da8611 (patch) | |
| tree | fbdb44317130c371928154c9e6903e699fe2b995 /drivers/hwmon/fschmd.c | |
| parent | 32ed53b83ea5ec26a4dba90e18f5e0ff6c71eb48 (diff) | |
| parent | f68e556e23d1a4176b563bcb25d8baf2c5313f91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/hwmon/fschmd.c')
| -rw-r--r-- | drivers/hwmon/fschmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c index 8305d29459bd..519ce8b9c142 100644 --- a/drivers/hwmon/fschmd.c +++ b/drivers/hwmon/fschmd.c | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; | 53 | static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; |
| 54 | 54 | ||
| 55 | /* Insmod parameters */ | 55 | /* Insmod parameters */ |
| 56 | static int nowayout = WATCHDOG_NOWAYOUT; | 56 | static bool nowayout = WATCHDOG_NOWAYOUT; |
| 57 | module_param(nowayout, int, 0); | 57 | module_param(nowayout, bool, 0); |
| 58 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" | 58 | MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" |
| 59 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); | 59 | __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); |
| 60 | 60 | ||