Merge 'acpi-2.6.12' branch into to-akpm

[linux-2.6] / include / acpi / platform / acgcc.h

diff --git a/include/acpi/platform/acgcc.h b/include/acpi/platform/acgcc.h
index e410e3b61415eab3509f3d3320440e5a2e73fba1..4c0e0ba09ba0213d4bd83a23314d88282a6f0fea 100644 (file)
--- a/include/acpi/platform/acgcc.h
+++ b/include/acpi/platform/acgcc.h
@@ -46,7 +46,7 @@
 
 /* Function name is used for debug output. Non-ANSI, compiler-dependent */
 
-#define ACPI_GET_FUNCTION_NAME          (char *) __FUNCTION__
+#define ACPI_GET_FUNCTION_NAME          __FUNCTION__
 
 /* This macro is used to tag functions as "printf-like" because
  * some compilers (like GCC) can catch printf format string problems.
@@ -60,4 +60,4 @@
  */
 #define ACPI_UNUSED_VAR __attribute__ ((unused))
 
-#endif /* __ACGCC_H__ */
+#endif                         /* __ACGCC_H__ */