diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-05-12 19:20:04 -0400 |
| commit | 1540c84b5ed657ed71dce06915bba461e6b09574 (patch) | |
| tree | a449dc166800a1b0c429bb038bfc974e577eaf72 /drivers/acpi/power_meter.c | |
| parent | 1a3a403aa98b0ccabeb12abd7da90d33250ea36b (diff) | |
| parent | 4640b4e7d9919e9629fe8456df94f71658431ef9 (diff) | |
Merge branch '2.6.33.4' into rt/2.6.33
Conflicts:
Makefile
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/acpi/power_meter.c')
| -rw-r--r-- | drivers/acpi/power_meter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c index dc4ffadf8122..e02d93c10c6a 100644 --- a/drivers/acpi/power_meter.c +++ b/drivers/acpi/power_meter.c | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | #define ACPI_POWER_METER_NAME "power_meter" | 34 | #define ACPI_POWER_METER_NAME "power_meter" |
| 35 | ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); | 35 | ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); |
| 36 | #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" | 36 | #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" |
| 37 | #define ACPI_POWER_METER_CLASS "power_meter_resource" | 37 | #define ACPI_POWER_METER_CLASS "pwr_meter_resource" |
| 38 | 38 | ||
| 39 | #define NUM_SENSORS 17 | 39 | #define NUM_SENSORS 17 |
| 40 | 40 | ||