From: Jeffrey Ohlstein <johlstei@codeaurora.org>
Date: Mon, 4 Apr 2011 20:08:25 +0000 (+0100)
Subject: ARM: 6863/1: allow hotplug on msm
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbb9e0b6e7d534b5d9e3c3eddb68b62d26ddb731;p=linux-beck.git

ARM: 6863/1: allow hotplug on msm

Hotplug support was added in 9f1890a (msm: hotplug: support cpu hotplug
on msm, 2010-12-02)

Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5be55d950ab5..abbd829f5419 100644
--- a/arch/arm/Kconfig
+++ b/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.