Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / utxferror.c

diff --git a/drivers/acpi/acpica/utxferror.c b/drivers/acpi/acpica/utxferror.c
index 950a1e500bfa2f09e0c72e69e9a73bef65f1f1d8..9da4f8ef2e77bae10a07d766db2ae86899093c33 100644 (file)
--- a/drivers/acpi/acpica/utxferror.c
+++ b/drivers/acpi/acpica/utxferror.c
@@ -96,8 +96,8 @@ ACPI_EXPORT_SYMBOL(acpi_error)
  *
  * RETURN:      None
  *
- * DESCRIPTION: Print "ACPI Exception" message with module/line/version info
- *              and decoded acpi_status.
+ * DESCRIPTION: Print an "ACPI Error" message with module/line/version
+ *              info as well as decoded acpi_status.
  *
  ******************************************************************************/
 void ACPI_INTERNAL_VAR_XFACE
@@ -111,10 +111,10 @@ acpi_exception(const char *module_name,
        /* For AE_OK, just print the message */
 
        if (ACPI_SUCCESS(status)) {
-               acpi_os_printf(ACPI_MSG_EXCEPTION);
+               acpi_os_printf(ACPI_MSG_ERROR);
 
        } else {
-               acpi_os_printf(ACPI_MSG_EXCEPTION "%s, ",
+               acpi_os_printf(ACPI_MSG_ERROR "%s, ",
                               acpi_format_exception(status));
        }