From fe3e0330c10f421884caadc7b26fabbb9bd8fbfa Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@fluxnic.net>
Date: Fri, 14 Jan 2011 07:33:24 +0100
Subject: [PATCH] --- yaml --- r: 231294 b: refs/heads/master c:
 4d2692a736c95240100755ba98b2403e11f12e06 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ee93cbad3a44..27aaf90ed61a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 874d5d3ccc04c0659b76b05ee0c761f568062cb1
+refs/heads/master: 4d2692a736c95240100755ba98b2403e11f12e06
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index a3fb23be87f3..53ea54782ef5 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -1275,7 +1275,7 @@ config SMP
 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.