diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:05:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-07 18:05:39 -0700 |
| commit | a06dee41a31bff488a261dfc542776ffd2f24ff1 (patch) | |
| tree | 4930b7698d5d238f159c2d6628c7c1c62765b42b /drivers/hwmon/Kconfig | |
| parent | b588e2bbd7b872c9cdf635fe0f04840534e72443 (diff) | |
| parent | 816d8c6a2580562698cf0fa0b9e5b4dd570e636e (diff) | |
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: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03
hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07
hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus
hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle
hwmon: ad7414 driver
hwmon: (thmc50) Add support for critical temperature limits
hwmon: (adm9240) Remove EXPERIMENTAL dependency
hwmon: (w83627hf) Drop reset module parameter
hwmon: (w83627hf) Add pwm_enable sysfs interface
hwmon: (w83791d) Use fan divisor bits from vbat register
hwmon: (f71882fg) Delete needless forward declarations
hwmon: (dme1737) Add support for the SMSC SCH5027
hwmon: (dme1737) Skip detection if forced
hwmon: (dme1737) Cleanups
Diffstat (limited to 'drivers/hwmon/Kconfig')
| -rw-r--r-- | drivers/hwmon/Kconfig | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index c882fd05cf2..bf4ebfb86fa 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -57,6 +57,16 @@ config SENSORS_ABITUGURU3 This driver can also be built as a module. If so, the module will be called abituguru3. +config SENSORS_AD7414 + tristate "Analog Devices AD7414" + depends on I2C && EXPERIMENTAL + help + If you say yes here you get support for the Analog Devices + AD7414 temperature monitoring chip. + + This driver can also be built as a module. If so, the module + will be called ad7414. + config SENSORS_AD7418 tristate "Analog Devices AD7416, AD7417 and AD7418" depends on I2C && EXPERIMENTAL @@ -124,7 +134,7 @@ config SENSORS_ADM1031 config SENSORS_ADM9240 tristate "Analog Devices ADM9240 and compatibles" - depends on I2C && EXPERIMENTAL + depends on I2C select HWMON_VID help If you say yes here you get support for Analog Devices ADM9240, @@ -575,8 +585,8 @@ config SENSORS_DME1737 select HWMON_VID help If you say yes here you get support for the hardware monitoring - and fan control features of the SMSC DME1737 (and compatibles - like the Asus A8000) and SCH311x Super-I/O chips. + and fan control features of the SMSC DME1737, SCH311x, SCH5027, and + Asus A8000 Super-I/O chips. This driver can also be built as a module. If so, the module will be called dme1737. |