---

yaml --- r: 350930 b: refs/heads/master c: d79beb3 h: refs/heads/master v: v3
git-mirror · Jan 19, 2013 · dc2dcc9 · dc2dcc9
1 parent e87ef51
commit dc2dcc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d56410b955c3f4f7651a088e1c7a19a0d5d4e4c
+refs/heads/master: d79beb39922e41083e8bbbb3de084a6ca958e25f
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
@@ -511,7 +511,7 @@ static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; }
 static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; }
 #endif
 
-#ifdef CONFIG_ACPI_SLEEP
+#if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP)
 int acpi_dev_suspend_late(struct device *dev);
 int acpi_dev_resume_early(struct device *dev);
 int acpi_subsys_prepare(struct device *dev);