aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS8
-rw-r--r--Documentation/hwmon/lm752
-rw-r--r--MAINTAINERS17
-rw-r--r--drivers/hwmon/lm75.h2
4 files changed, 12 insertions, 17 deletions
diff --git a/CREDITS b/CREDITS
index 78163cb3eb6..afaa7cec6ea 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
1510D: Cobalt Networks (x86) support 1510D: Cobalt Networks (x86) support
1511D: This-and-That 1511D: This-and-That
1512 1512
1513N: Mark M. Hoffman
1514E: mhoffman@lightlink.com
1515D: asb100, lm93 and smsc47b397 hardware monitoring drivers
1516D: hwmon subsystem core
1517D: hwmon subsystem maintainer
1518D: i2c-sis96x and i2c-stub SMBus drivers
1519S: USA
1520
1513N: Dirk Hohndel 1521N: Dirk Hohndel
1514E: hohndel@suse.de 1522E: hohndel@suse.de
1515D: The XFree86[tm] Project 1523D: The XFree86[tm] Project
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75
index c91a1d15fa2..69af1c7db6b 100644
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
@@ -23,7 +23,7 @@ Supported chips:
23 Datasheet: Publicly available at the Maxim website 23 Datasheet: Publicly available at the Maxim website
24 http://www.maxim-ic.com/ 24 http://www.maxim-ic.com/
25 * Microchip (TelCom) TCN75 25 * Microchip (TelCom) TCN75
26 Prefix: 'lm75' 26 Prefix: 'tcn75'
27 Addresses scanned: none 27 Addresses scanned: none
28 Datasheet: Publicly available at the Microchip website 28 Datasheet: Publicly available at the Microchip website
29 http://www.microchip.com/ 29 http://www.microchip.com/
diff --git a/MAINTAINERS b/MAINTAINERS
index 50b4d735f96..fb89be1281c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1338,12 +1338,6 @@ S: Maintained
1338F: drivers/platform/x86/asus*.c 1338F: drivers/platform/x86/asus*.c
1339F: drivers/platform/x86/eeepc*.c 1339F: drivers/platform/x86/eeepc*.c
1340 1340
1341ASUS ASB100 HARDWARE MONITOR DRIVER
1342M: "Mark M. Hoffman" <mhoffman@lightlink.com>
1343L: lm-sensors@lm-sensors.org
1344S: Maintained
1345F: drivers/hwmon/asb100.c
1346
1347ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API 1341ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
1348M: Dan Williams <djbw@fb.com> 1342M: Dan Williams <djbw@fb.com>
1349W: http://sourceforge.net/projects/xscaleiop 1343W: http://sourceforge.net/projects/xscaleiop
@@ -3851,7 +3845,7 @@ F: drivers/i2c/busses/i2c-ismt.c
3851F: Documentation/i2c/busses/i2c-ismt 3845F: Documentation/i2c/busses/i2c-ismt
3852 3846
3853I2C/SMBUS STUB DRIVER 3847I2C/SMBUS STUB DRIVER
3854M: "Mark M. Hoffman" <mhoffman@lightlink.com> 3848M: Jean Delvare <khali@linux-fr.org>
3855L: linux-i2c@vger.kernel.org 3849L: linux-i2c@vger.kernel.org
3856S: Maintained 3850S: Maintained
3857F: drivers/i2c/i2c-stub.c 3851F: drivers/i2c/i2c-stub.c
@@ -7198,13 +7192,6 @@ L: netdev@vger.kernel.org
7198S: Maintained 7192S: Maintained
7199F: drivers/net/ethernet/sis/sis900.* 7193F: drivers/net/ethernet/sis/sis900.*
7200 7194
7201SIS 96X I2C/SMBUS DRIVER
7202M: "Mark M. Hoffman" <mhoffman@lightlink.com>
7203L: linux-i2c@vger.kernel.org
7204S: Maintained
7205F: Documentation/i2c/busses/i2c-sis96x
7206F: drivers/i2c/busses/i2c-sis96x.c
7207
7208SIS FRAMEBUFFER DRIVER 7195SIS FRAMEBUFFER DRIVER
7209M: Thomas Winischhofer <thomas@winischhofer.net> 7196M: Thomas Winischhofer <thomas@winischhofer.net>
7210W: http://www.winischhofer.net/linuxsisvga.shtml 7197W: http://www.winischhofer.net/linuxsisvga.shtml
@@ -7282,7 +7269,7 @@ F: Documentation/hwmon/sch5627
7282F: drivers/hwmon/sch5627.c 7269F: drivers/hwmon/sch5627.c
7283 7270
7284SMSC47B397 HARDWARE MONITOR DRIVER 7271SMSC47B397 HARDWARE MONITOR DRIVER
7285M: "Mark M. Hoffman" <mhoffman@lightlink.com> 7272M: Jean Delvare <khali@linux-fr.org>
7286L: lm-sensors@lm-sensors.org 7273L: lm-sensors@lm-sensors.org
7287S: Maintained 7274S: Maintained
7288F: Documentation/hwmon/smsc47b397 7275F: Documentation/hwmon/smsc47b397
diff --git a/drivers/hwmon/lm75.h b/drivers/hwmon/lm75.h
index 668ff472132..5cde94e56f1 100644
--- a/drivers/hwmon/lm75.h
+++ b/drivers/hwmon/lm75.h
@@ -25,7 +25,7 @@
25 which contains this code, we don't worry about the wasted space. 25 which contains this code, we don't worry about the wasted space.
26*/ 26*/
27 27
28#include <linux/hwmon.h> 28#include <linux/kernel.h>
29 29
30/* straight from the datasheet */ 30/* straight from the datasheet */
31#define LM75_TEMP_MIN (-55000) 31#define LM75_TEMP_MIN (-55000)