diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-25 17:30:53 +0100 |
| commit | 0b9e31e9264f1bad89856afb96da1688292f13b4 (patch) | |
| tree | 7a9e9b6456dce993efeed8734de0a15a1f16ae94 /drivers/acpi/thermal.c | |
| parent | sched: Remove obsolete comment in sched_init() (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| download | linux-0b9e31e9264f1bad89856afb96da1688292f13b4.tar.xz linux-0b9e31e9264f1bad89856afb96da1688292f13b4.zip | |
Merge branch 'linus' into sched/core
Conflicts:
fs/proc/array.c
Merge reason: resolve conflict and queue up dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/acpi/thermal.c')
| -rw-r--r-- | drivers/acpi/thermal.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 564ea1424288..65f67815902a 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -47,6 +47,8 @@ #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> +#define PREFIX "ACPI: " + #define ACPI_THERMAL_CLASS "thermal_zone" #define ACPI_THERMAL_DEVICE_NAME "Thermal Zone" #define ACPI_THERMAL_FILE_STATE "state" |