summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-03-18 22:00:29 +0100
committerLen Brown <len.brown@intel.com>2005-07-12 05:18:35 +0200
commitbe91492ca871e58f61b517cfba541095bb60001c (patch)
tree46b5b35a2b5211a7dc653d0146f0d2d81923a1ef /drivers
parent[ACPI] Allow simultaneous Fixed Feature and Control Method buttons (diff)
downloadlinux-be91492ca871e58f61b517cfba541095bb60001c.tar.xz
linux-be91492ca871e58f61b517cfba541095bb60001c.zip
[ACPI] CONFIG_ACPI now depends on CONFIG_PM
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acpi/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 4aa26acbc46d..ceecc5634e74 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -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 @@ if ACPI_INTERPRETER
config ACPI_SLEEP
bool "Sleep States (EXPERIMENTAL)"
depends on X86
- depends on EXPERIMENTAL && PM
+ depends on EXPERIMENTAL
default y
---help---
This option adds support for ACPI suspend states.