Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index b53d87958710bcfa40d06d078e4e60e77f450672..bc196f49ec53be2e13959a9ebca9aa9c82edcfff 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -280,8 +280,8 @@ config SENSORS_K10TEMP
          If you say yes here you get support for the temperature
          sensor(s) inside your CPU. Supported are later revisions of
          the AMD Family 10h and all revisions of the AMD Family 11h,
-         12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
-         16h (Kabini) microarchitectures.
+         12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri) and
+         16h (Kabini/Mullins) microarchitectures.
 
          This driver can also be built as a module.  If so, the module
          will be called k10temp.
@@ -554,14 +554,6 @@ config SENSORS_IBMPEX
          This driver can also be built as a module.  If so, the module
          will be called ibmpex.
 
-config SENSORS_IBMPOWERNV
-       tristate "IBM PowerNv Platform temperature/power/fan sensor"
-       depends on PPC_POWERNV
-       default y
-       help
-         If you say yes here you get support for the temperature/fan/power
-         sensors on your platform.
-
 config SENSORS_IIO_HWMON
        tristate "Hwmon driver that uses channels specified via iio maps"
        depends on IIO