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 /drivers/hwmon/Kconfig | |
| parent | ab03eca8d4754ef2ba9821d581975b10b8f317e7 (diff) | |
| parent | 51b3e2700177b89fdb0d985926ce777a7ad52b15 (diff) | |
| download | kernel-crypto-5216a3c6d10c891015474fbf7126c92a1845bf74.tar.gz kernel-crypto-5216a3c6d10c891015474fbf7126c92a1845bf74.tar.xz kernel-crypto-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 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index b84bf066879..b4eea0292c1 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -543,8 +543,8 @@ config SENSORS_LM90 help If you say yes here you get support for National Semiconductor LM90, LM86, LM89 and LM99, Analog Devices ADM1032 and ADT7461, and Maxim - MAX6646, MAX6647, MAX6649, MAX6657, MAX6658, MAX6659, MAX6680 and - MAX6681 sensor chips. + MAX6646, MAX6647, MAX6648, MAX6649, MAX6657, MAX6658, MAX6659, + MAX6680, MAX6681 and MAX6692 sensor chips. This driver can also be built as a module. If so, the module will be called lm90. |