Merge commit 'v2.6.26' into bkl-removal

[linux-2.6-omap-h63xx.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 368879ff5d8c5642250c9a9db9962dcff45aa83e..00ff53348491be4f12b3174187aacbf8cb9291b7 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -330,6 +330,20 @@ config SENSORS_CORETEMP
          sensor inside your CPU. Supported all are all known variants
          of Intel Core family.
 
+config SENSORS_IBMAEM
+       tristate "IBM Active Energy Manager temperature/power sensors and control"
+       select IPMI_SI
+       depends on IPMI_HANDLER
+       help
+         If you say yes here you get support for the temperature and
+         power sensors and capping hardware in various IBM System X
+         servers that support Active Energy Manager.  This includes
+         the x3350, x3550, x3650, x3655, x3755, x3850 M2, x3950 M2,
+         and certain HS2x/LS2x/QS2x blades.
+
+         This driver can also be built as a module.  If so, the module
+         will be called ibmaem.
+
 config SENSORS_IBMPEX
        tristate "IBM PowerExecutive temperature/power sensors"
        select IPMI_SI
@@ -337,8 +351,9 @@ config SENSORS_IBMPEX
        help
          If you say yes here you get support for the temperature and
          power sensors in various IBM System X servers that support
-         PowerExecutive.  So far this includes the x3550, x3650, x3655,
-         x3755, and certain HS20 blades.
+         PowerExecutive.  So far this includes the x3350, x3550, x3650,
+         x3655, and x3755; the x3800, x3850, and x3950 models that have
+         PCI Express; and some of the HS2x, LS2x, and QS2x blades.
 
          This driver can also be built as a module.  If so, the module
          will be called ibmpex.