From fa91f0c6cdbbcc460bb9c0544ed9415644a1ff9e Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@gmail.com>
Date: Mon, 9 Nov 2009 14:37:59 +0800
Subject: [PATCH] --- yaml --- r: 172589 b: refs/heads/master c:
 15cc7112abb66e7e1c956135ba2390638acf3416 h: refs/heads/master i:   172587:
 aabcf5b30c296ca3b24bf16a0d3f5d311c7a5052 v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-pxa/Kconfig | 65 ++++++++++++++++++---------------
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index f78f1c4277d1..09d1858e64de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9035a9ece9819155ed6a12654ab5d5293d3f2545
+refs/heads/master: 15cc7112abb66e7e1c956135ba2390638acf3416
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index 4bd0f8740b24..20e645a6943a 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/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