summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-09-19 06:37:13 +0200
committerLen Brown <len.brown@intel.com>2009-09-19 06:37:13 +0200
commit003d6a38ce1a59e0053a02fd9e9a65b588bc8e33 (patch)
treec9b941f4798a2accca200b0b01c07353ce5b07e1 /include/acpi
parentMerge branch 'linus' into release (diff)
parentACPI: Handle CONFIG_ACPI=n better from linux/acpi.h (diff)
downloadlinux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.tar.xz
linux-003d6a38ce1a59e0053a02fd9e9a65b588bc8e33.zip
Merge branch 'sfi-base' into release
Conflicts: drivers/acpi/power.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_bus.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 1fa3ffb7c93b..ca59ee9cc651 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -30,8 +30,6 @@
#include <acpi/acpi.h>
-#define PREFIX "ACPI: "
-
/* TBD: Make dynamic */
#define ACPI_MAX_HANDLES 10
struct acpi_handle_list {