From 9ebfb1fedeb0fa1e8b626e2a86d239d635c35cd5 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 27 Apr 2010 14:01:07 -0700 Subject: [PATCH] --- yaml --- r: 190709 b: refs/heads/master c: 18262714ca0fb65c290b8ea1807b2b02bb52d0e3 h: refs/heads/master i: 190707: f6ac02372e3c796e67dbca78fb100cee6ec5fe14 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/power_meter.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e8af6de3fbd3..09340a1fbde9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a40770a9537c72b555667851845e73484b22ba17 +refs/heads/master: 18262714ca0fb65c290b8ea1807b2b02bb52d0e3 diff --git a/trunk/drivers/acpi/power_meter.c b/trunk/drivers/acpi/power_meter.c index e8c32a49f14e..66f67293341e 100644 --- a/trunk/drivers/acpi/power_meter.c +++ b/trunk/drivers/acpi/power_meter.c @@ -35,7 +35,7 @@ #define ACPI_POWER_METER_NAME "power_meter" ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" -#define ACPI_POWER_METER_CLASS "power_meter_resource" +#define ACPI_POWER_METER_CLASS "pwr_meter_resource" #define NUM_SENSORS 17