Commit 112ccff7 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 fixes from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm75) Fix tcn75 prefix
  hwmon: (lm75.h) Update header inclusion
  MAINTAINERS: Remove Mark M. Hoffman
parents 9997d088 25eba81b

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1510,6 +1510,14 @@ D: Natsemi ethernet 
D: Cobalt Networks (x86) support

D: This-and-That



N: Mark M. Hoffman

E: mhoffman@lightlink.com

D: asb100, lm93 and smsc47b397 hardware monitoring drivers

D: hwmon subsystem core

D: hwmon subsystem maintainer

D: i2c-sis96x and i2c-stub SMBus drivers

S: USA



N: Dirk Hohndel

E: hohndel@suse.de

D: The XFree86[tm] Project

Documentation/hwmon/lm75

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ Supported chips: 
    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/

  * Microchip (TelCom) TCN75

    Prefix: 'lm75'

    Prefix: 'tcn75'

    Addresses scanned: none

    Datasheet: Publicly available at the Microchip website

               http://www.microchip.com/

MAINTAINERS

+2 −15
Original line number Diff line number Diff line
@@ -1338,12 +1338,6 @@ S: Maintained 
F:	drivers/platform/x86/asus*.c

F:	drivers/platform/x86/eeepc*.c



ASUS ASB100 HARDWARE MONITOR DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	drivers/hwmon/asb100.c



ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API

M:	Dan Williams <djbw@fb.com>

W:	http://sourceforge.net/projects/xscaleiop
@@ -3851,7 +3845,7 @@ F: drivers/i2c/busses/i2c-ismt.c 
F:	Documentation/i2c/busses/i2c-ismt



I2C/SMBUS STUB DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

M:	Jean Delvare <khali@linux-fr.org>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	drivers/i2c/i2c-stub.c
@@ -7198,13 +7192,6 @@ L: netdev@vger.kernel.org 
S:	Maintained

F:	drivers/net/ethernet/sis/sis900.*



SIS 96X I2C/SMBUS DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

L:	linux-i2c@vger.kernel.org

S:	Maintained

F:	Documentation/i2c/busses/i2c-sis96x

F:	drivers/i2c/busses/i2c-sis96x.c



SIS FRAMEBUFFER DRIVER

M:	Thomas Winischhofer <thomas@winischhofer.net>

W:	http://www.winischhofer.net/linuxsisvga.shtml
@@ -7282,7 +7269,7 @@ F: Documentation/hwmon/sch5627 
F:	drivers/hwmon/sch5627.c



SMSC47B397 HARDWARE MONITOR DRIVER

M:	"Mark M. Hoffman" <mhoffman@lightlink.com>

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/smsc47b397

drivers/hwmon/lm75.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
    which contains this code, we don't worry about the wasted space.

*/



#include <linux/hwmon.h>

#include <linux/kernel.h>



/* straight from the datasheet */

#define LM75_TEMP_MIN (-55000)