From 03405f3c2088153eb0db5a63c9117bb5b0143771 Mon Sep 17 00:00:00 2001
From: Bob Moore <robert.moore@intel.com>
Date: Mon, 14 Feb 2011 16:02:36 +0800
Subject: [PATCH] --- yaml --- r: 241688 b: refs/heads/master c:
 d59a3c6b35995615fa9e4f21d63fdf21328c5b6b h: refs/heads/master v: v3

---
 [refs]                        |  2 +-
 trunk/include/acpi/acoutput.h | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 46812723030e..a79bdbcd95b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a257e07527890a7f95982b9c330efd8d2de3707a
+refs/heads/master: d59a3c6b35995615fa9e4f21d63fdf21328c5b6b
diff --git a/trunk/include/acpi/acoutput.h b/trunk/include/acpi/acoutput.h
index ef1cef77d32b..d7bd661bfae7 100644
--- a/trunk/include/acpi/acoutput.h
+++ b/trunk/include/acpi/acoutput.h
@@ -183,13 +183,19 @@
 
 #if defined (ACPI_DEBUG_OUTPUT) || !defined (ACPI_NO_ERROR_MESSAGES)
 /*
- * Module name is included in both debug and non-debug versions primarily for
- * error messages. The __FILE__ macro is not very useful for this, because it
- * often includes the entire pathname to the module
+ * The module name is used primarily for error and debug messages.
+ * The __FILE__ macro is not very useful for this, because it
+ * usually includes the entire pathname to the module making the
+ * debug output difficult to read.
  */
 #define ACPI_MODULE_NAME(name)          static const char ACPI_UNUSED_VAR _acpi_module_name[] = name;
 #else
+/*
+ * For the no-debug and no-error-msg cases, we must at least define
+ * a null module name.
+ */
 #define ACPI_MODULE_NAME(name)
+#define _acpi_module_name ""
 #endif
 
 /*