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 e0dede7198c88e9c7f96d285e2735e1d4401bf57..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.