Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6:
  hwmon: Fix debug messages in w83781d
  hwmon: Let w83781d and lm78 load again
  w83627ehf: Fix the detection of fan5
  k8temp: Documentation update
  smsc47m1: List the SMSC LPC47M112 as supported
  hwmon: Fix documentation typos
  adm9240: Update Grant Coady's email address
  w83791d: Fix unchecked return status

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9b88b25b6edb..e76d91906c99 100644
--- 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