diff --git a/[refs] b/[refs] index 90ca56779d4c..44288b8ab774 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77b23f712bc40a65160e7d02b045f1562bb43ff1 +refs/heads/master: 75434a2ae37b78887b7a1d70d0a23bbd5e09fb01 diff --git a/trunk/drivers/acpi/acpica/utxferror.c b/trunk/drivers/acpi/acpica/utxferror.c index bf679c4885fd..6f12e314fbae 100644 --- a/trunk/drivers/acpi/acpica/utxferror.c +++ b/trunk/drivers/acpi/acpica/utxferror.c @@ -221,7 +221,7 @@ ACPI_EXPORT_SYMBOL(acpi_info) * The remainder of this module contains internal error functions that may * be configured out. */ -#ifndef ACPI_NO_ERROR_MESSAGES +#if !defined (ACPI_NO_ERROR_MESSAGES) && !defined (ACPI_BIN_APP) /******************************************************************************* * * FUNCTION: acpi_ut_predefined_warning