Merge commit 'v2.6.38-rc2' into core/locking

[pandora-kernel.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index fae931a..5d3d9ad 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -40,11 +40,13 @@ config ARCH_MSM8X60
        bool "MSM8X60"
        select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
                                  && !MACH_MSM8X60_FFA)
+       select ARCH_MSM_SCORPIONMP
        select ARM_GIC
        select CPU_V7
        select MSM_V2_TLMM
        select MSM_GPIOMUX
        select IOMMU_API
+       select MSM_SCM if SMP
 
 endchoice
 
@@ -172,4 +174,7 @@ config MSM_V2_TLMM
 
 config IOMMU_API
        bool
+
+config MSM_SCM
+       bool
 endif