X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=include%2Facpi%2Facmacros.h;h=99d171c87c84897123d7cdde56a8c7d83300c5f5;hb=4adeaaf51ebcc3f629f5512b96aebb5089388bca;hp=45662f6dbdb66b34b8966670187ffd6655737aa6;hpb=d6da5ce8cc71a13e2f3671361c5a8bd9b82e014d;p=linux-2.6-omap-h63xx.git

diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index 45662f6dbdb..99d171c87c8 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -486,7 +486,7 @@
 #define ACPI_FUNCTION_NAME(name)
 #endif
 
-#ifdef DEBUG_FUNC_TRACE
+#ifdef CONFIG_ACPI_DEBUG_FUNC_TRACE
 
 #define ACPI_FUNCTION_TRACE(a)          ACPI_FUNCTION_NAME(a) \
 			  acpi_ut_trace(ACPI_DEBUG_PARAMETERS)
@@ -565,7 +565,7 @@
 
 #endif				/* ACPI_SIMPLE_RETURN_MACROS */
 
-#else /* !DEBUG_FUNC_TRACE */
+#else /* !CONFIG_ACPI_DEBUG_FUNC_TRACE */
 
 #define ACPI_FUNCTION_TRACE(a)
 #define ACPI_FUNCTION_TRACE_PTR(a,b)
@@ -584,7 +584,7 @@
 #define return_UINT32(s)                return(s)
 #define return_PTR(s)                   return(s)
 
-#endif /* DEBUG_FUNC_TRACE */
+#endif /* CONFIG_ACPI_DEBUG_FUNC_TRACE */
 
 /* Conditional execution */