From: Len Brown <len.brown@intel.com>
Date: Fri, 5 Apr 2019 05:07:45 +0000 (-0500)
Subject: [ACPI] fix merge error that broke CONFIG_ACPI_DEBUG=y build
X-Git-Tag: v2.6.13-rc3~10^2^2~3
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a27ac38efd6dc6dccebfc9bcc475ab4aa5fc4a56;p=linux-2.6

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

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

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 4550e6f980..6c2aef0e0d 100644
--- 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) */