diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 09:48:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-26 09:48:23 -0700 |
| commit | c5436731de860b3a3cff70c62d99242418aab1d1 (patch) | |
| tree | 090cd8a6be43e74c7675e61f20132d9d7cce713a /drivers | |
| parent | Merge tag 'mmc-v4.7-rc1' of git://git.linaro.org/people/ulf.hansson/mmc (diff) | |
| parent | Documentation/hwmon: Update links in max34440 (diff) | |
| download | linux-dev-c5436731de860b3a3cff70c62d99242418aab1d1.tar.xz linux-dev-c5436731de860b3a3cff70c62d99242418aab1d1.zip | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon fixlets from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
Documentation/hwmon: Update links in max34440
hwmon: (emc2103) Fix typo in MODULE_PARM_DESC
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/emc2103.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/emc2103.c b/drivers/hwmon/emc2103.c index 952fe692d764..24e395c5907d 100644 --- a/drivers/hwmon/emc2103.c +++ b/drivers/hwmon/emc2103.c @@ -58,7 +58,7 @@ static const u8 REG_TEMP_MAX[4] = { 0x34, 0x30, 0x31, 0x32 }; */ static int apd = -1; module_param(apd, bint, 0); -MODULE_PARM_DESC(init, "Set to zero to disable anti-parallel diode mode"); +MODULE_PARM_DESC(apd, "Set to zero to disable anti-parallel diode mode"); struct temperature { s8 degrees; |