Merge branch 'next/boards' into HEAD

[karo-tx-linux.git] / arch / arm / mach-msm / Kconfig

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index b2740c800e8cb934869f88142bbcb3ccf343a9e1..7902de151cc5bedf339b2f5d75e694f5ad70cd78 100644 (file)
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,8 +1,12 @@
 if ARCH_MSM
 
+comment "Qualcomm MSM SoC Type"
+       depends on (ARCH_MSM8X60 || ARCH_MSM8960)
+
 choice
        prompt "Qualcomm MSM SoC Type"
        default ARCH_MSM7X00A
+       depends on !(ARCH_MSM8X60 || ARCH_MSM8960)
 
 config ARCH_MSM7X00A
        bool "MSM7x00A / MSM7x01A"
@@ -36,6 +40,8 @@ config ARCH_QSD8X50
        select GPIO_MSM_V1
        select MSM_PROC_COMM
 
+endchoice
+
 config ARCH_MSM8X60
        bool "MSM8X60"
        select ARCH_MSM_SCORPIONMP
@@ -57,8 +63,6 @@ config ARCH_MSM8960
        select MSM_SCM if SMP
        select USE_OF
 
-endchoice
-
 config MSM_HAS_DEBUG_UART_HS
        bool