Merge branch 'simplify_PRT' into release

[sfrench/cifs-2.6.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 813f937b3ab46db8ccfc5644f346c82c1c953ca6..6fce2fc2d124bc184da9f10f40e31ed97254a7f5 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -254,6 +254,7 @@ int acpi_check_mem_region(resource_size_t start, resource_size_t n,
 #ifdef CONFIG_PM_SLEEP
 void __init acpi_no_s4_hw_signature(void);
 void __init acpi_old_suspend_ordering(void);
+void __init acpi_s4_no_nvs(void);
 #endif /* CONFIG_PM_SLEEP */
 #else  /* CONFIG_ACPI */