Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

[linux-2.6-omap-h63xx.git] / drivers / acpi / Kconfig

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 251344cb29aea1f04f2e42935b52c68c09103ba3..22b401b2e0884d4a33a3e7a41c9258cc5341bcf7 100644 (file)
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,9 +11,6 @@ menuconfig ACPI
        depends on PCI
        depends on PM
        select PNP
-       # for sleep
-       select HOTPLUG_CPU if X86 && SMP
-       select SUSPEND_SMP if X86 && SMP
        default y
        ---help---
          Advanced Configuration and Power Interface (ACPI) support for