diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 16:25:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-12 16:25:04 -0700 |
| commit | 5216a3c6d10c891015474fbf7126c92a1845bf74 (patch) | |
| tree | 8655b8f225c620432368db57195e69884beee506 /Documentation | |
| parent | ab03eca8d4754ef2ba9821d581975b10b8f317e7 (diff) | |
| parent | 51b3e2700177b89fdb0d985926ce777a7ad52b15 (diff) | |
| download | talos-op-linux-5216a3c6d10c891015474fbf7126c92a1845bf74.tar.gz talos-op-linux-5216a3c6d10c891015474fbf7126c92a1845bf74.zip | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon: (f75375s) Remove unnecessary and confusing initialization
hwmon: (it87) Properly decode -128 degrees C temperature
hwmon: (lm90) Document support for the MAX6648/6692 chips
hwmon: (abituguru3) Fix I/O error handling
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/lm90 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/hwmon/lm90 b/Documentation/hwmon/lm90 index 0e8411710238..93d8e3d55150 100644 --- a/Documentation/hwmon/lm90 +++ b/Documentation/hwmon/lm90 @@ -42,6 +42,11 @@ Supported chips: Addresses scanned: I2C 0x4e Datasheet: Publicly available at the Maxim website http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497 + * Maxim MAX6648 + Prefix: 'max6646' + Addresses scanned: I2C 0x4c + Datasheet: Publicly available at the Maxim website + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 * Maxim MAX6649 Prefix: 'max6646' Addresses scanned: I2C 0x4c @@ -74,6 +79,11 @@ Supported chips: 0x4c, 0x4d and 0x4e Datasheet: Publicly available at the Maxim website http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370 + * Maxim MAX6692 + Prefix: 'max6646' + Addresses scanned: I2C 0x4c + Datasheet: Publicly available at the Maxim website + http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500 Author: Jean Delvare <khali@linux-fr.org> |
