Merge branch 'late/fixes' into fixes

[~andy/linux] / arch / arm / mach-prima2 / Kconfig

diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
index 587c0bd7043471659cc48645e7840055a061f023..6988b117fc174a70e049df575417dea3093daa1b 100644 (file)
--- a/arch/arm/mach-prima2/Kconfig
+++ b/arch/arm/mach-prima2/Kconfig
@@ -36,8 +36,9 @@ config ARCH_MARCO
        default y
        select ARM_GIC
        select CPU_V7
+       select HAVE_ARM_SCU if SMP
        select HAVE_SMP
-       select SMP_ON_UP
+       select SMP_ON_UP if SMP
        help
           Support for CSR SiRFSoC ARM Cortex A9 Platform