commit 4d2692a736c95240100755ba98b2403e11f12e06
author Nicolas Pitre <nico@fluxnic.net> Fri Jan 14 07:33:24 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri Jan 14 09:00:46 2011 +0000
tree ce2e04aaeb7c6ab946400d49feeea8386db587ae
parent 874d5d3ccc04c0659b76b05ee0c761f568062cb1

ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP

This depends on !XIP_KERNEL and not !XIP.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a3fb23b..53ea547 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1275,7 +1275,7 @@
 config SMP_ON_UP
 	bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
-	depends on SMP && !XIP
+	depends on SMP && !XIP_KERNEL
 	default y
 	help
 	  SMP kernels contain instructions which fail on non-SMP processors.