Commit c5436731 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0e77816e 1dc2c9f5

Documentation/hwmon/max34440

+3 −3
Original line number Diff line number Diff line
@@ -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'

drivers/hwmon/emc2103.c

+1 −1
Original line number Diff line number Diff line
@@ -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;