commit a27ac38efd6dc6dccebfc9bcc475ab4aa5fc4a56
author Len Brown <len.brown@intel.com> Fri Apr 05 00:07:45 2019 -0500
committer Len Brown <len.brown@intel.com> Tue Jul 12 00:12:09 2005 -0400
tree 7faece1ad5a2b8ff6d6f6babbcd53e88e91bc71d
parent 590275ce72c48fdbddea057bc9ee379c1fd851ef

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

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/namespace/nsdump.c

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 4550e6f..6c2aef0 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -612,6 +612,7 @@
 			 ACPI_NS_WALK_NO_UNLOCK, acpi_ns_dump_one_object,
 			 (void *) &info, NULL);
 }
+#endif	/* ACPI_FUTURE_USAGE */
 
 
 /*******************************************************************************
@@ -694,5 +695,4 @@
 	return_VOID;
 }
 #endif	/* _ACPI_ASL_COMPILER */
-#endif  /* ACPI_FUTURE_USAGE */
 #endif	/* defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER) */