summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-05-26 19:48:23 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-05-26 19:48:23 +0300
commitc5436731de860b3a3cff70c62d99242418aab1d1 (patch)
tree090cd8a6be43e74c7675e61f20132d9d7cce713a /drivers
parent0e77816e096c4ae27e98977fef56b6b9169f9017 (diff)
parent1dc2c9f54b4b781f5630a042c14a7098beae0f3c (diff)
downloadlinux-c5436731de860b3a3cff70c62d99242418aab1d1.tar.xz
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.c2
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;