diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 01:45:22 -0400 |
| commit | 985f38781d19101aba121df423f92c87b208c6df (patch) | |
| tree | 21b10413b6e24c0eaf5c3b2432e936749a672644 /drivers/acpi/acpica/acmacros.h | |
| parent | d093d70a81b08673d1577ad73419998f02be9d29 (diff) | |
| parent | c9766237afa92e8d7f27bbcd4964f1b43fa0bce8 (diff) | |
Merge branch 'acpica' into release
Diffstat (limited to 'drivers/acpi/acpica/acmacros.h')
| -rw-r--r-- | drivers/acpi/acpica/acmacros.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index 91ac7d7b4402..3acd9c6760ea 100644 --- a/drivers/acpi/acpica/acmacros.h +++ b/drivers/acpi/acpica/acmacros.h | |||
| @@ -340,6 +340,7 @@ | |||
| 340 | */ | 340 | */ |
| 341 | #define ACPI_ERROR_NAMESPACE(s, e) acpi_ns_report_error (AE_INFO, s, e); | 341 | #define ACPI_ERROR_NAMESPACE(s, e) acpi_ns_report_error (AE_INFO, s, e); |
| 342 | #define ACPI_ERROR_METHOD(s, n, p, e) acpi_ns_report_method_error (AE_INFO, s, n, p, e); | 342 | #define ACPI_ERROR_METHOD(s, n, p, e) acpi_ns_report_method_error (AE_INFO, s, n, p, e); |
| 343 | #define ACPI_WARN_PREDEFINED(plist) acpi_ut_predefined_warning plist | ||
| 343 | 344 | ||
| 344 | #else | 345 | #else |
| 345 | 346 | ||
| @@ -347,6 +348,7 @@ | |||
| 347 | 348 | ||
| 348 | #define ACPI_ERROR_NAMESPACE(s, e) | 349 | #define ACPI_ERROR_NAMESPACE(s, e) |
| 349 | #define ACPI_ERROR_METHOD(s, n, p, e) | 350 | #define ACPI_ERROR_METHOD(s, n, p, e) |
| 351 | #define ACPI_WARN_PREDEFINED(plist) | ||
| 350 | #endif /* ACPI_NO_ERROR_MESSAGES */ | 352 | #endif /* ACPI_NO_ERROR_MESSAGES */ |
| 351 | 353 | ||
| 352 | /* | 354 | /* |