From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 30 Apr 2013 11:21:41 +0000 (+0200)
Subject: ARM: SIRF: select SMP_ON_UP only on SMP builds
X-Git-Tag: v3.10-rc1~23^2~10^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb0c480a4634b03b740fe82e256a8b988481e2bf;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

ARM: SIRF: select SMP_ON_UP only on SMP builds

Like all other platforms, we can only select SMP_ON_UP if SMP
is also enabled.

warning: (SOC_IMX31 && SOC_IMX35 && ARCH_MARCO) selects
 SMP_ON_UP which has unmet direct dependencies (SMP && !XIP_KERNEL)

Cc: Barry Song <baohua.song@csr.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 4f7379f..5e6ab9d 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -17,7 +17,7 @@ config ARCH_MARCO
 	select ARM_GIC
 	select CPU_V7
 	select HAVE_SMP
-	select SMP_ON_UP
+	select SMP_ON_UP if SMP
 	help
           Support for CSR SiRFSoC ARM Cortex A9 Platform