---

yaml --- r: 336674 b: refs/heads/master c: 9743fde h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · 02f2bb1 · 02f2bb1
1 parent b8abd0e
commit 02f2bb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bad2f19f7f79d1ec9e6c48168fd7ce8dc1c305f
+refs/heads/master: 9743fdea9f9473cd2440741342a5ed8e19eb51bd
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
@@ -257,8 +257,11 @@ int acpi_check_region(resource_size_t start, resource_size_t n,
 
 int acpi_resources_are_enforced(void);
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_HIBERNATION
 void __init acpi_no_s4_hw_signature(void);
+#endif
+
+#ifdef CONFIG_PM_SLEEP
 void __init acpi_old_suspend_ordering(void);
 void __init acpi_nvs_nosave(void);
 void __init acpi_nvs_nosave_s3(void);