From dc2dcc904a703c25b8fd4b6f0c2b4340cf5c5e20 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Sat, 19 Jan 2013 14:29:31 +0100 Subject: [PATCH] --- yaml --- r: 350930 b: refs/heads/master c: d79beb39922e41083e8bbbb3de084a6ca958e25f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/acpi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1a5cda29bb5..b69779383a1e 100644 --- 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 index 8c1d6f2a2193..5f2be833aaf8 100644 --- 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);