ACPI: restore CONFIG_ACPI_SLEEP
authorLen Brown <len.brown@intel.com>
Sat, 28 Jul 2007 07:33:16 +0000 (03:33 -0400)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 29 Jul 2007 23:53:59 +0000 (16:53 -0700)
commit673d5b43daa00b42759cecc6b0760b8bf6be80d2
treea795ee922db699a8b4cb893ef5809399f1591ba6
parent296699de6bdc717189a331ab6bbe90e05c94db06
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>
13 files changed:
arch/i386/kernel/acpi/Makefile
arch/i386/kernel/setup.c
arch/x86_64/kernel/acpi/Makefile
arch/x86_64/kernel/head.S
arch/x86_64/kernel/setup.c
drivers/acpi/Kconfig
drivers/acpi/sleep/Makefile
drivers/acpi/sleep/poweroff.c
drivers/acpi/sleep/proc.c
drivers/pci/pci-acpi.c
drivers/pnp/pnpacpi/core.c
include/acpi/acpi_drivers.h
kernel/sysctl.c