[PATCH] ACPI compile fix

This fixes the ACPI_DEBUG compile issue that turned up.

diff --git a/drivers/acpi/include/aclocal.h b/drivers/acpi/include/aclocal.h
index d97fc5e8f8abd216612a20d5c6d66595c7954048..f9d6e2f1f031e6ddc51cdbcf76a7c468043e7446 100644 (file)
--- a/drivers/acpi/include/aclocal.h
+++ b/drivers/acpi/include/aclocal.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: aclocal.h - Internal data types used across the ACPI subsystem
- *       $Revision: 172 $
+ *       $Revision: 173 $
  *
  *****************************************************************************/
 
@@ -567,7 +567,7 @@ acpi_status (*ACPI_EXECUTE_OP) (
  */
 typedef struct acpi_opcode_info
 {
-#ifdef ACPI_DISASSEMBLER
+#if defined(ACPI_DISASSEMBLER) || defined(ACPI_DEBUG)
        NATIVE_CHAR             *name;          /* Opcode name (disassembler/debug only) */
 #endif
        u32                     parse_args;     /* Grammar/Parse time arguments */

diff --git a/drivers/acpi/include/acmacros.h b/drivers/acpi/include/acmacros.h
index c8e79b0f76d4744c4f0c1ec8a408c25ac9c0eaec..57452f9b6cbf14afc2a43d20df7ebc9cc20883a3 100644 (file)
--- a/drivers/acpi/include/acmacros.h
+++ b/drivers/acpi/include/acmacros.h
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Name: acmacros.h - C macros for the entire subsystem.
- *       $Revision: 125 $
+ *       $Revision: 126 $
  *
  *****************************************************************************/
 
@@ -287,11 +287,15 @@
 /*
  * Macros for the master AML opcode table
  */
-#ifdef ACPI_DISASSEMBLER
+#if defined(ACPI_DISASSEMBLER) || defined (ACPI_DEBUG)
 #define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags)    {name,Pargs,Iargs,flags,obj_type,class,type}
-#define ACPI_DISASM_ONLY_MEMBERS(a)      a;
 #else
 #define ACPI_OP(name,Pargs,Iargs,obj_type,class,type,flags)    {Pargs,Iargs,flags,obj_type,class,type}
+#endif
+
+#ifdef ACPI_DISASSEMBLER
+#define ACPI_DISASM_ONLY_MEMBERS(a)      a;
+#else
 #define ACPI_DISASM_ONLY_MEMBERS(a)
 #endif
 

diff --git a/drivers/acpi/parser/psutils.c b/drivers/acpi/parser/psutils.c
index 7605080eeb62f3aff315f9c537c8c3d25632f503..7c8950786d35e6411e52239d52e3778970d9d03a 100644 (file)
--- a/drivers/acpi/parser/psutils.c
+++ b/drivers/acpi/parser/psutils.c
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
  * Module Name: psutils - Parser miscellaneous utilities (Parser only)
- *              $Revision: 53 $
+ *              $Revision: 54 $
  *
  *****************************************************************************/
 
@@ -88,7 +88,7 @@ acpi_ps_init_op (
        op->common.data_type = ACPI_DESC_TYPE_PARSER;
        op->common.aml_opcode = opcode;
 
-       ACPI_DEBUG_ONLY_MEMBERS (ACPI_STRNCPY (op->common.aml_op_name,
+       ACPI_DISASM_ONLY_MEMBERS (ACPI_STRNCPY (op->common.aml_op_name,
                        (acpi_ps_get_opcode_info (opcode))->name, sizeof (op->common.aml_op_name)));
 }