From f36d421594a1fdfdb5584429e22c05f645d196d5 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 26 Jul 2007 13:44:58 -0700
Subject: [PATCH] --- yaml --- r: 63007 b: refs/heads/master c:
 293a032eb95f3c6c212c1541e94c14b111731313 h: refs/heads/master i:   63005:
 ff375b5bbe9fe5ed8acbe22acb7cf7d5c7909f2c   63003:
 4289156892b176f13d533bac0286fcf390d75430   62999:
 9a366ce59cfa270ce7d18a9b1b522cbd596971cc   62991:
 90324fa66f53e626dc826b46c4d463400bc97fe5   62975:
 cafae32b366b6c1aca3c9fbad467daa3bf29d168 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/acpi/Kconfig | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 74f73be32b1b..207b8ac133b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58b3b71dfaaecbf7cff1fe10c049d663f0313e5f
+refs/heads/master: 293a032eb95f3c6c212c1541e94c14b111731313
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
index 251344cb29ae..22b401b2e088 100644
--- a/trunk/drivers/acpi/Kconfig
+++ b/trunk/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