From 2e57c46f713d162c17d36e87859eb3865bd53245 Mon Sep 17 00:00:00 2001
From: Jeffrey Ohlstein <johlstei@codeaurora.org>
Date: Mon, 4 Apr 2011 21:08:25 +0100
Subject: [PATCH] --- yaml --- r: 252400 b: refs/heads/master c:
 fbb9e0b6e7d534b5d9e3c3eddb68b62d26ddb731 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2a4fa0b91dc..ec5493f8c4d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40f7bfe4f1c2761abeceb3b2b9dc1feec3c47ed9
+refs/heads/master: fbb9e0b6e7d534b5d9e3c3eddb68b62d26ddb731
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 5be55d950ab5..abbd829f5419 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1399,7 +1399,6 @@ config NR_CPUS
 config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 	depends on SMP && HOTPLUG && EXPERIMENTAL
-	depends on !ARCH_MSM
 	help
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.