Merge branch 'acpi-messages'

[linux-2.6-microblaze.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3bdcfc4..92f63b8 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -1034,9 +1034,14 @@ static inline void acpi_ec_set_gpe_wake_mask(u8 action) {}
 __printf(3, 4)
 void acpi_handle_printk(const char *level, acpi_handle handle,
                        const char *fmt, ...);
+void acpi_evaluation_failure_warn(acpi_handle handle, const char *name,
+                                 acpi_status status);
 #else  /* !CONFIG_ACPI */
 static inline __printf(3, 4) void
 acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {}
+static inline void acpi_evaluation_failure_warn(acpi_handle handle,
+                                               const char *name,
+                                               acpi_status status) {}
 #endif /* !CONFIG_ACPI */
 
 #if defined(CONFIG_ACPI) && defined(CONFIG_DYNAMIC_DEBUG)