---

yaml
---
r: 172589
b: refs/heads/master
c: 15cc711
h: refs/heads/master
i:
  172587: aabcf5b
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9035a9ece9819155ed6a12654ab5d5293d3f2545
+refs/heads/master: 15cc7112abb66e7e1c956135ba2390638acf3416

trunk/arch/arm/mach-pxa/Kconfig

@@ -2,35 +2,6 @@ if ARCH_PXA
 
 menu "Intel PXA2xx/PXA3xx Implementations"
 
-if PXA3xx
-
-menu "Supported PXA3xx Processor Variants"
-
-config CPU_PXA300
-	bool "PXA300 (codename Monahans-L)"
-
-config CPU_PXA310
-	bool "PXA310 (codename Monahans-LV)"
-	select CPU_PXA300
-
-config CPU_PXA320
-	bool "PXA320 (codename Monahans-P)"
-
-config CPU_PXA930
-	bool "PXA930 (codename Tavor-P)"
-
-config CPU_PXA935
-	bool "PXA935 (codename Tavor-P65)"
-	select CPU_PXA930
-
-config CPU_PXA950
-	bool "PXA950 (codename Tavor-PV2)"
-	select CPU_PXA930
-
-endmenu
-
-endif
-
 comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
 config ARCH_LUBBOCK
@@ -585,6 +556,42 @@ config PXA3xx
 	help
 	  Select code specific to PXA3xx variants
 
+config CPU_PXA300
+	bool
+	select PXA3xx
+	help
+	  PXA300 (codename Monahans-L)
+
+config CPU_PXA310
+	bool
+	select CPU_PXA300
+	help
+	  PXA310 (codename Monahans-LV)
+
+config CPU_PXA320
+	bool
+	select PXA3xx
+	help
+	  PXA320 (codename Monahans-P)
+
+config CPU_PXA930
+	bool
+	select PXA3xx
+	help
+	  PXA930 (codename Tavor-P)
+
+config CPU_PXA935
+	bool
+	select CPU_PXA930
+	help
+	  PXA935 (codename Tavor-P65)
+
+config CPU_PXA950
+	bool
+	select CPU_PXA930
+	help
+	  PXA950 (codename Tavor-PV2)
+
 config PXA_SHARP_C7xx
 	bool
 	select PXA_SSP