Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[mv-sheeva.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 164760df1233371a636976777fc72768ae3b31e0..0e31a0c496e8ae44ce3ed29322d6169787480e91 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1,5 +1,5 @@
 #
-# I2C Sensor chip drivers configuration
+# Hardware monitoring chip drivers configuration
 #
 
 menu "Hardware Monitoring support"
@@ -27,6 +27,18 @@ config HWMON_VID
        tristate
        default n
 
+config SENSORS_ABITUGURU
+       tristate "Abit uGuru"
+       depends on HWMON && EXPERIMENTAL
+       help
+         If you say yes here you get support for the Abit uGuru chips
+         sensor part. The voltage and frequency control parts of the Abit
+         uGuru are not supported. The Abit uGuru chip can be found on Abit
+         uGuru featuring motherboards (most modern Abit motherboards).
+
+         This driver can also be built as a module.  If so, the module
+         will be called abituguru.
+
 config SENSORS_ADM1021
        tristate "Analog Devices ADM1021 and compatibles"
        depends on HWMON && I2C
@@ -192,6 +204,16 @@ config SENSORS_LM63
          This driver can also be built as a module.  If so, the module
          will be called lm63.
 
+config SENSORS_LM70
+       tristate "National Semiconductor LM70"
+       depends on HWMON && SPI_MASTER && EXPERIMENTAL
+       help
+         If you say yes here you get support for the National Semiconductor
+         LM70 digital temperature sensor chip.
+
+         This driver can also be built as a module.  If so, the module
+         will be called lm70.
+
 config SENSORS_LM75
        tristate "National Semiconductor LM75 and compatibles"
        depends on HWMON && I2C