summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/power.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 00:37:13 -0400
committerLen Brown <len.brown@intel.com>2009-09-19 00:37:13 -0400
commit003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch)
treec9b941f4798a2accca200b0b01c07353ce5b07e1 /drivers/acpi/power.c
parent71fd68e7d234f6b7d8407c8f486764d24f8411f4 (diff)
parente55a5999ffcf72dc4d43d73618957964cb87065a (diff)
Merge branch 'sfi-base' into release
Conflicts: drivers/acpi/power.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/power.c')
-rw-r--r--drivers/acpi/power.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c
index 5a09bf392ec..22b29791651 100644
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
@@ -43,9 +43,10 @@
#include <linux/seq_file.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
-
#include "sleep.h"
+#define PREFIX "ACPI: "
+
#define _COMPONENT ACPI_POWER_COMPONENT
ACPI_MODULE_NAME("power");
#define ACPI_POWER_CLASS "power_resource"