aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/Kconfig
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-28 03:33:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 16:53:59 -0700
commit673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch)
treea795ee922db699a8b4cb893ef5809399f1591ba6 /drivers/acpi/Kconfig
parent296699de6bdc717189a331ab6bbe90e05c94db06 (diff)
downloadkernel_samsung_espresso10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.zip
kernel_samsung_espresso10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.gz
kernel_samsung_espresso10-673d5b43daa00b42759cecc6b0760b8bf6be80d2.tar.bz2
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the new CONFIG_PM_SLEEP option. Signed-off-by: Len Brown <len.brown@intel.com> [ Modified to work with the PM config setup changes. ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/Kconfig')
-rw-r--r--drivers/acpi/Kconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 66e78d5..934d639 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -42,6 +42,11 @@ menuconfig ACPI
if ACPI
+config ACPI_SLEEP
+ bool
+ depends on PM_SLEEP
+ default y
+
config ACPI_PROCFS
bool "Deprecated /proc/acpi files"
depends on PROC_FS