diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 20:40:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-31 20:40:50 -0700 |
| commit | dd9cd6d4351076c78bb8c0f9146d1904b481fdbb (patch) | |
| tree | d633c460e2232def1a59b0e6f6c00711d835d911 /drivers/hwmon/Kconfig | |
| parent | 128a2bcf9dddeb8e79a4ba55bf191533f70f39ce (diff) | |
| parent | 5cccf4a1a258ea5bff20e8440deb3dfcf032b04a (diff) | |
| download | kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.tar.gz kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.tar.xz kernel-crypto-dd9cd6d4351076c78bb8c0f9146d1904b481fdbb.zip | |
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
hwmon: fscher read control bugfix
hwmon: (adm1031) Fix broken links in documentation
hwmon: make abituguru3_read_increment_offset() static
hwmon: Fix regression caused by typo in lm90.c
hwmon: (applesmc) add temperature sensors set for Macbook
hwmon: fscher control update bugfix
hwmon: fix dme1737 temp fault attribute
hwmon: Add missing __devexit tags in various drivers
hwmon: clean up duplicate includes
hwmon: fix lm78 detection regression
hwmon: fix array overruns in lm93.c
hwmon: add support for THMC50 and ADM1022
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index dbdca6f10e4..192953b29b2 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -520,6 +520,16 @@ config SENSORS_SMSC47B397 This driver can also be built as a module. If so, the module will be called smsc47b397. +config SENSORS_THMC50 + tristate "Texas Instruments THMC50 / Analog Devices ADM1022" + depends on I2C && EXPERIMENTAL + help + If you say yes here you get support for Texas Instruments THMC50 + sensor chips and clones: the Analog Devices ADM1022. + + This driver can also be built as a module. If so, the module + will be called thmc50. + config SENSORS_VIA686A tristate "VIA686A" depends on PCI |