summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/Kconfig
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@us.ibm.com>2008-05-23 13:04:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-24 09:56:08 -0700
commit8808a793f052c0a67426a24b961402fa20e92814 (patch)
tree8ee7a898dee93e95545d4b6f39628e3c52a2e0a1 /drivers/hwmon/Kconfig
parentb8fdaf5a05adbf80e5a943bb3f65b46b5fb9b488 (diff)
downloadblackbird-op-linux-8808a793f052c0a67426a24b961402fa20e92814.tar.gz
blackbird-op-linux-8808a793f052c0a67426a24b961402fa20e92814.zip
ibmaem: new driver for power/energy/temp meters in IBM System X hardware
This driver reads IBM Active Energy Manager energy/temperature/power sensors on IBM System X hardware. [akpm@linux-foundation.org: fix printk warnings] Signed-off-by: Darrick J. Wong <djwong@us.ibm.com> Cc: "Mark M. Hoffman" <mhoffman@lightlink.com> Cc: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/hwmon/Kconfig')
-rw-r--r--drivers/hwmon/Kconfig14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 4dc76bc45c9d..00ff53348491 100644
--- 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
OpenPOWER on IntegriCloud