From 1cb66b2a38fb3c96d67d276ac5a69e5ef3a65dbb Mon Sep 17 00:00:00 2001
From: Daniel Walker <dwalker@codeaurora.org>
Date: Tue, 7 Sep 2010 13:33:05 -0700
Subject: [PATCH] --- yaml --- r: 225791 b: refs/heads/master c:
 176bfc44417544724e6df0831a7f576f4a56283d h: refs/heads/master i:   225789:
 4c35d4c5966e1fdb6f299d919df9698859706e55   225787:
 01bb513b2226e2e84a7fffce59b07aff8ad8d8a7   225783:
 2a2781190a8265c59a05b1ab7e5ea2b9eaa0028e   225775:
 ee5b38544506f5955d10b3b8b8e072db2c38df8d   225759:
 1b8c3d620b4e5935dea0b6b37a15483c37983d6f   225727:
 a0239e4b40523125458cc69b0084499f33c91a84   225663:
 1bc7c3a94ee254a97b0f1a88323d694f16fb5e95   225535:
 29d568c7bec845ee07e7cc26ae378ab2228a393e   225279:
 0c33c8976083d945b4f0c17d93a26f800aa411fb v: v3

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

diff --git a/[refs] b/[refs]
index 22c140132590..ea1262d2db4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89c3dedf477da9c8d42d3a63d16875e52f74108b
+refs/heads/master: 176bfc44417544724e6df0831a7f576f4a56283d
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 1a61017a54c8..c8fa1443e2c1 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1284,6 +1284,7 @@ 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.