diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-19 14:29:31 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-19 22:09:53 +0100 |
| commit | d79beb39922e41083e8bbbb3de084a6ca958e25f (patch) | |
| tree | 36041cddbb489cdadff4133e5924420a8e4a1f20 /include/linux/acpi.h | |
| parent | 4d56410b955c3f4f7651a088e1c7a19a0d5d4e4c (diff) | |
| download | op-kernel-dev-d79beb39922e41083e8bbbb3de084a6ca958e25f.zip op-kernel-dev-d79beb39922e41083e8bbbb3de084a6ca958e25f.tar.gz | |
ACPI / PM: Fix build for unusual combination of Kconfig options
CONFIG_PM_SLEEP may be set even if CONFIG_ACPI_SLEEP is unset,
although that is unusual. For this reason, make the headers of
functions built for both CONFIG_ACPI and CONFIG_PM_SLEEP set
simultaneously depend on that combination of Kconfig options
instead of CONFIG_ACPI_SLEEP.
This fixes a build problem reported by Randy Dunlap.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 8c1d6f2..5f2be83 100644 --- a/include/linux/acpi.h +++ b/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); |
