Skip to content

L
linux
Commit a27ac38e authored by Len Brown's avatar Len Brown
Browse files
Options

[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build 

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 590275ce
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/acpi/namespace/nsdump.c
View file @ a27ac38e
...@@ -612,6 +612,7 @@ acpi_ns_dump_objects ( ...@@ -612,6 +612,7 @@ acpi_ns_dump_objects (
ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object, ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
(void *) &info, NULL); (void *) &info, NULL);
} }
#endif /* ACPI_FUTURE_USAGE */
/******************************************************************************* /*******************************************************************************
...@@ -694,5 +695,4 @@ acpi_ns_dump_tables ( ...@@ -694,5 +695,4 @@ acpi_ns_dump_tables (
return_VOID; return_VOID;
} }
#endif /* _ACPI_ASL_COMPILER */ #endif /* _ACPI_ASL_COMPILER */
#endif /* ACPI_FUTURE_USAGE */
#endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */ #endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7