X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=include%2Facpi%2Facmacros.h;h=a597207e28352ab4de53a69d9d6eb8d29f6c0a28;hb=bc9c4068388eea01d3b5da31016879f2341ecec5;hp=a1e3240bf460ba10950014559edf267eaa563a01;hpb=4dff4e7f6cbcd2722b02dbb394ba87c4e05f8841;p=linux-2.6-omap-h63xx.git

diff --git a/include/acpi/acmacros.h b/include/acpi/acmacros.h
index a1e3240bf46..a597207e283 100644
--- a/include/acpi/acmacros.h
+++ b/include/acpi/acmacros.h
@@ -447,7 +447,7 @@ struct acpi_integer_overlay {
 /*
  * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,
  * define it now. This is the case where there the compiler does not support
- * a __FUNCTION__ macro or equivalent.
+ * a __func__ macro or equivalent.
  */
 #ifndef ACPI_GET_FUNCTION_NAME
 #define ACPI_GET_FUNCTION_NAME          _acpi_function_name
@@ -455,12 +455,12 @@ struct acpi_integer_overlay {
  * The Name parameter should be the procedure name as a quoted string.
  * The function name is also used by the function exit macros below.
  * Note: (const char) is used to be compatible with the debug interfaces
- * and macros such as __FUNCTION__.
+ * and macros such as __func__.
  */
 #define ACPI_FUNCTION_NAME(name)	static const char _acpi_function_name[] = #name;
 
 #else
-/* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */
+/* Compiler supports __func__ (or equivalent) -- Ignore this macro */
 
 #define ACPI_FUNCTION_NAME(name)
 #endif