aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-30 07:21:41 -0400
committerArnd Bergmann <arnd@arndb.de>2013-05-03 16:36:32 -0400
commitcb0c480a4634b03b740fe82e256a8b988481e2bf (patch)
tree36d7c925a28aa8482661ebf9a5ea1bdfecbcc361 /arch/arm/mach-prima2
parent6343b05f0a77c5d76d291d15c5cf2d9cf1b4e700 (diff)
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>
Diffstat (limited to 'arch/arm/mach-prima2')
-rw-r--r--arch/arm/mach-prima2/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 4f7379fe01e2..5e6ab9d6f50f 100644
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -17,7 +17,7 @@ config ARCH_MARCO
17 select ARM_GIC 17 select ARM_GIC
18 select CPU_V7 18 select CPU_V7
19 select HAVE_SMP 19 select HAVE_SMP
20 select SMP_ON_UP 20 select SMP_ON_UP if SMP
21 help 21 help
22 Support for CSR SiRFSoC ARM Cortex A9 Platform 22 Support for CSR SiRFSoC ARM Cortex A9 Platform
23 23