From a988c0f4032a8e2aefc59e0de9072e6930c42782 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 15 Jun 2009 18:39:46 +0200 Subject: [PATCH] --- yaml --- r: 151019 b: refs/heads/master c: 8070408b5446232ba6eb6e0809a329da58a6ae52 h: refs/heads/master i: 151017: b3f214dbc73bdad46ed440ebf68e0dc11714c0e3 151015: 341a63bd6ed924a4b5456db81cead65f5196a8be v: v3 --- [refs] | 2 +- trunk/Documentation/hwmon/ibmaem | 2 +- trunk/drivers/hwmon/Kconfig | 2 +- trunk/drivers/hwmon/ibmaem.c | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4629abe05b1a..eab995349a87 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd659fd0d7c91b7830d1fea0c76a640e171d2d43 +refs/heads/master: 8070408b5446232ba6eb6e0809a329da58a6ae52 diff --git a/trunk/Documentation/hwmon/ibmaem b/trunk/Documentation/hwmon/ibmaem index e98bdfea3467..1e0d59e000b4 100644 --- a/trunk/Documentation/hwmon/ibmaem +++ b/trunk/Documentation/hwmon/ibmaem @@ -7,7 +7,7 @@ henceforth as AEM. Supported systems: * Any recent IBM System X server with AEM support. This includes the x3350, x3550, x3650, x3655, x3755, x3850 M2, - x3950 M2, and certain HS2x/LS2x/QS2x blades. The IPMI host interface + x3950 M2, and certain HC10/HS2x/LS2x/QS2x blades. The IPMI host interface driver ("ipmi-si") needs to be loaded for this driver to do anything. Prefix: 'ibmaem' Datasheet: Not available diff --git a/trunk/drivers/hwmon/Kconfig b/trunk/drivers/hwmon/Kconfig index d73f5f473e38..86a5cff0c027 100644 --- a/trunk/drivers/hwmon/Kconfig +++ b/trunk/drivers/hwmon/Kconfig @@ -418,7 +418,7 @@ config SENSORS_IBMAEM 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. + and certain HC10/HS2x/LS2x/QS2x blades. This driver can also be built as a module. If so, the module will be called ibmaem. diff --git a/trunk/drivers/hwmon/ibmaem.c b/trunk/drivers/hwmon/ibmaem.c index fe74609a7feb..405d3fb5d76f 100644 --- a/trunk/drivers/hwmon/ibmaem.c +++ b/trunk/drivers/hwmon/ibmaem.c @@ -1127,3 +1127,4 @@ MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3650-*"); MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3655-*"); MODULE_ALIAS("dmi:bvnIBM:*:pnIBMSystemx3755-*"); MODULE_ALIAS("dmi:bvnIBM:*:pnIBM3850M2/x3950M2-*"); +MODULE_ALIAS("dmi:bvnIBM:*:pnIBMBladeHC10-*");