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

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

[ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
Signed-off-by: N Len Brown <len.brown@intel.com>
a27ac38e · Len Brown · 590275ce · a27ac38e
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/acpi/namespace/nsdump.c drivers/acpi/namespace/nsdump.c +1 -1

未找到文件。
--- 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) */