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.