diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-29 23:27:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-30 01:45:38 +0200 |
| commit | 296699de6bdc717189a331ab6bbe90e05c94db06 (patch) | |
| tree | 53c847ecc8cce11952502921844052e44ca60d5e /drivers/acpi/Kconfig | |
| parent | Replace CONFIG_SOFTWARE_SUSPEND with CONFIG_HIBERNATION (diff) | |
| download | linux-296699de6bdc717189a331ab6bbe90e05c94db06.tar.xz linux-296699de6bdc717189a331ab6bbe90e05c94db06.zip | |
Introduce CONFIG_SUSPEND for suspend-to-Ram and standby
Introduce CONFIG_SUSPEND representing the ability to enter system sleep
states, such as the ACPI S3 state, and allow the user to choose SUSPEND
and HIBERNATION independently of each other.
Make HOTPLUG_CPU be selected automatically if SUSPEND or HIBERNATION has
been chosen and the kernel is intended for SMP systems.
Also, introduce CONFIG_PM_SLEEP which is automatically selected if
CONFIG_SUSPEND or CONFIG_HIBERNATION is set and use it to select the
code needed for both suspend and hibernation.
The top-level power management headers and the ACPI code related to
suspend and hibernation are modified to use the new definitions (the
changes in drivers/acpi/sleep/main.c are, mostly, moving code to reduce
the number of ifdefs).
There are many other files in which CONFIG_PM can be replaced with
CONFIG_PM_SLEEP or even with CONFIG_SUSPEND, but they can be updated in
the future.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 22b401b2e088..66e78d52a093 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -63,6 +63,14 @@ config ACPI_PROCFS Say N to delete /proc/acpi/ files that have moved to /sys/ +config ACPI_PROCFS_SLEEP + bool "/proc/acpi/sleep (deprecated)" + depends on PM_SLEEP && ACPI_PROCFS + default n + ---help--- + Create /proc/acpi/sleep + Deprecated by /sys/power/state + config ACPI_AC tristate "AC Adapter" depends on X86 |