summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-30 13:21:41 +0200
committerArnd Bergmann <arnd@arndb.de>2013-05-03 22:36:32 +0200
commitcb0c480a4634b03b740fe82e256a8b988481e2bf (patch)
tree36d7c925a28aa8482661ebf9a5ea1bdfecbcc361
parent6343b05f0a77c5d76d291d15c5cf2d9cf1b4e700 (diff)
downloadop-kernel-dev-cb0c480a4634b03b740fe82e256a8b988481e2bf.zip
op-kernel-dev-cb0c480a4634b03b740fe82e256a8b988481e2bf.tar.gz
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>
-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 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
OpenPOWER on IntegriCloud