OrgACRN
/
acrn-kernel
mirror of https://github.com/projectacrn/acrn-kernel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2016-05-26 09:48:23 -07:00
parent 0e77816e09 1dc2c9f54b
commit c5436731de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/hwmon/max34440
View File

@ -5,17 +5,17 @@ Supported chips:
* Maxim MAX34440 * Maxim MAX34440
Prefixes: 'max34440' Prefixes: 'max34440'
Addresses scanned: - Addresses scanned: -
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34440.pdf Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34440.pdf
* Maxim MAX34441 * Maxim MAX34441
PMBus 5-Channel Power-Supply Manager and Intelligent Fan Controller PMBus 5-Channel Power-Supply Manager and Intelligent Fan Controller
Prefixes: 'max34441' Prefixes: 'max34441'
Addresses scanned: - Addresses scanned: -
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34441.pdf Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34441.pdf
* Maxim MAX34446 * Maxim MAX34446
PMBus Power-Supply Data Logger PMBus Power-Supply Data Logger
Prefixes: 'max34446' Prefixes: 'max34446'
Addresses scanned: - Addresses scanned: -
Datasheet: http://datasheets.maxim-ic.com/en/ds/MAX34446.pdf Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX34446.pdf
* Maxim MAX34460 * Maxim MAX34460
PMBus 12-Channel Voltage Monitor & Sequencer PMBus 12-Channel Voltage Monitor & Sequencer
Prefix: 'max34460' Prefix: 'max34460'

2
drivers/hwmon/emc2103.c
View File

@ -58,7 +58,7 @@ static const u8 REG_TEMP_MAX[4] = { 0x34, 0x30, 0x31, 0x32 };
*/ */
static int apd = -1; static int apd = -1;
module_param(apd, bint, 0); 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 { struct temperature {
s8 degrees; s8 degrees;