Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

[linux-2.6] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 696543ba6a29a8ae516c41d766d0145065000d2c..e76d91906c99a3ab671dbb9e0736e3e197901efc 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -95,11 +95,13 @@ config SENSORS_ADM9240
          will be called adm9240.
 
 config SENSORS_K8TEMP
-       tristate "AMD K8 processor sensor"
+       tristate "AMD Athlon64/FX or Opteron temperature sensor"
        depends on HWMON && X86 && PCI && EXPERIMENTAL
        help
          If you say yes here you get support for the temperature
-         sensor(s) inside your AMD K8 CPU.
+         sensor(s) inside your CPU. Supported is whole AMD K8
+         microarchitecture. Please note that you will need at least
+         lm-sensors 2.10.1 for proper userspace support.
 
          This driver can also be built as a module.  If so, the module
          will be called k8temp.
@@ -369,8 +371,8 @@ config SENSORS_SMSC47M1
        help
          If you say yes here you get support for the integrated fan
          monitoring and control capabilities of the SMSC LPC47B27x,
-         LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x, LPC47M192 and
-         LPC47M997 chips.
+         LPC47M10x, LPC47M112, LPC47M13x, LPC47M14x, LPC47M15x,
+         LPC47M192 and LPC47M997 chips.
 
          The temperature and voltage sensor features of the LPC47M192
          and LPC47M997 are supported by another driver, select also
@@ -417,6 +419,17 @@ config SENSORS_VIA686A
          This driver can also be built as a module.  If so, the module
          will be called via686a.
 
+config SENSORS_VT1211
+       tristate "VIA VT1211"
+       depends on HWMON && EXPERIMENTAL
+       select HWMON_VID
+       help
+         If you say yes here then you get support for hardware monitoring
+         features of the VIA VT1211 Super-I/O chip.
+
+         This driver can also be built as a module.  If so, the module
+         will be called vt1211.
+
 config SENSORS_VT8231
        tristate "VIA VT8231"
        depends on HWMON && I2C && PCI && EXPERIMENTAL