# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2005/03/18 16:00:29-05:00 len.brown@intel.com # [ACPI] CONFIG_ACPI now depends on CONFIG_PM # # Signed-off-by: Len Brown # # drivers/acpi/Kconfig # 2005/03/18 16:00:07-05:00 len.brown@intel.com +2 -1 # CONFIG_ACPI now depends on CONFIG_PM # Index: linux-2.6.13/drivers/acpi/Kconfig =================================================================== --- linux-2.6.13.orig/drivers/acpi/Kconfig 2005-07-10 01:03:04.000000000 -0400 +++ linux-2.6.13/drivers/acpi/Kconfig 2005-07-10 01:03:59.000000000 -0400 @@ -3,6 +3,7 @@ # menu "ACPI (Advanced Configuration and Power Interface) Support" + depends on PM depends on !X86_VISWS depends on !IA64_HP_SIM depends on IA64 || X86 @@ -56,7 +57,7 @@ config ACPI_SLEEP bool "Sleep States (EXPERIMENTAL)" depends on X86 && (!SMP || SUSPEND_SMP) - depends on EXPERIMENTAL && PM + depends on EXPERIMENTAL default y ---help--- This option adds support for ACPI suspend states.