---

yaml --- r: 327048 b: refs/heads/master c: 33fcb13 h: refs/heads/master v: v3
git-mirror · Sep 13, 2012 · cf5243d · cf5243d
1 parent eefea75
commit cf5243d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb03af01c612ba97621a927225791a98357959c1
+refs/heads/master: 33fcb13dc543af610c7c930dbfeeed6e6ed02376
diff --git a/trunk/arch/arm/mach-msm/Kconfig b/trunk/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 MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
@@ -58,8 +64,6 @@ config ARCH_MSM8960
 	select MSM_GPIOMUX
 	select MSM_SCM if SMP
 
-endchoice
-
 config MSM_HAS_DEBUG_UART_HS
 	bool