Merge tag 'v4.0-rc3' into x86/build, to refresh an older tree before applying new...

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpica / utdebug.c

diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 57078e3ea9b746568b6bbe7349ccc6636782f975..4f3f888d33bb189793adc849a9c3217f981927d0 100644 (file)
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -111,8 +111,8 @@ void acpi_ut_track_stack_ptr(void)
  * RETURN:      Updated pointer to the function name
  *
  * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
- *              This allows compiler macros such as __FUNCTION__ to be used
- *              with no change to the debug output.
+ *              This allows compiler macros such as __func__ to be used with no
+ *              change to the debug output.
  *
  ******************************************************************************/