Merge branch 'nfs-for-2.6.39' into nfs-for-next

[mv-sheeva.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 10c7ad59c0e1bac4df5abb550feafe323b6da2e1..3a17ca5fff6f022d207107ff741b6b22ba300190 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -7,7 +7,6 @@ menuconfig ACPI
        depends on !IA64_HP_SIM
        depends on IA64 || X86
        depends on PCI
-       depends on PM
        select PNP
        default y
        help
@@ -318,7 +317,7 @@ config ACPI_PCI_SLOT
          the module will be called pci_slot.
 
 config X86_PM_TIMER
-       bool "Power Management Timer Support" if EMBEDDED
+       bool "Power Management Timer Support" if EXPERT
        depends on X86
        default y
        help