tree 7faece1ad5a2b8ff6d6f6babbcd53e88e91bc71d
parent 590275ce72c48fdbddea057bc9ee379c1fd851ef
author Len Brown <[EMAIL PROTECTED]> Fri, 05 Apr 2019 10:07:45 -0500
committer Len Brown <[EMAIL PROTECTED]> Tue, 12 Jul 2005 08:12:09 -0400
[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
Signed-off-by: Len Brown <[EMAIL PROTECTED]>
drivers/acpi/namespace/nsdump.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -612,6 +612,7 @@ acpi_ns_dump_objects (
ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
(void *) &info, NULL);
}
+#endif /* ACPI_FUTURE_USAGE */
/*******************************************************************************
@@ -694,5 +695,4 @@ acpi_ns_dump_tables (
return_VOID;
}
#endif /* _ACPI_ASL_COMPILER */
-#endif /* ACPI_FUTURE_USAGE */
#endif /* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
