From 54f0ffc4e249b7f7e7fffb10c83e8de99aca839c Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 26 May 2016 11:06:53 +0200 Subject: [PATCH 1/2] hwmon: (emc2103) Fix typo in MODULE_PARM_DESC "apd" was intended here instead of "init". Signed-off-by: Dan Carpenter Signed-off-by: Jean Delvare --- drivers/hwmon/emc2103.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 1dc2c9f54b4b781f5630a042c14a7098beae0f3c Mon Sep 17 00:00:00 2001 From: Glenn Dayton Date: Thu, 26 May 2016 11:06:53 +0200 Subject: [PATCH 2/2] Documentation/hwmon: Update links in max34440 It appears the website for maxim-ic.com changed to maximintegrated.com. Signed-off-by: Glenn Dayton Signed-off-by: Jean Delvare --- Documentation/hwmon/max34440 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/hwmon/max34440 b/Documentation/hwmon/max34440 index f5b1fcaa9e4e..9ba6587b7657 100644 --- a/Documentation/hwmon/max34440 +++ b/Documentation/hwmon/max34440 @@ -5,17 +5,17 @@ Supported chips: * Maxim MAX34440 Prefixes: 'max34440' Addresses scanned: - - Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34440.pdf + Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34440.pdf * Maxim MAX34441 PMBus 5-Channel Power-Supply Manager and Intelligent Fan Controller Prefixes: 'max34441' Addresses scanned: - - Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34441.pdf + Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34441.pdf * Maxim MAX34446 PMBus Power-Supply Data Logger Prefixes: 'max34446' Addresses scanned: - - Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34446.pdf + Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34446.pdf * Maxim MAX34460 PMBus 12-Channel Voltage Monitor & Sequencer Prefix: 'max34460'