From 2e1ccb341a16cc74f5279d17451d9a2c55f5f82f Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Wed, 2 Jul 2008 13:50:09 +0100
Subject: [PATCH] --- yaml --- r: 105095 b: refs/heads/master c:
 c0b8556f2f8146bd38324b14b1ce00f249ba8ed9 h: refs/heads/master i:   105093:
 0dba669434253cde0ad9679712dcf5c84d856f1d   105091:
 878a6cc390d703f50dcbab9e156da3ec424468ad   105087:
 5cb3272340da8e4c494820a43a233afc7d94b58f v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-pxa/Kconfig | 48 +++++++--------------------------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/[refs] b/[refs]
index 1e4d88b48e10..37e1051c1e36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b4f5ba07a16d2c84ac6cc312488cc6cc0db518
+refs/heads/master: c0b8556f2f8146bd38324b14b1ce00f249ba8ed9
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index 01d23e5717ae..faa2c3f6c1af 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/trunk/arch/arm/mach-pxa/Kconfig
@@ -20,14 +20,17 @@ endmenu
 
 endif
 
-menu "Select target boards"
-
 config ARCH_GUMSTIX
 	bool "Gumstix XScale boards"
 	help
 	  Say Y here if you intend to run this kernel on a
 	  Gumstix Full Function Minature Computer.
 
+config MACH_GUMSTIX_F
+	bool "Basix, Connex, ws-200ax, ws-400ax systems"
+	depends on ARCH_GUMSTIX
+	select PXA25x
+
 config ARCH_LUBBOCK
 	bool "Intel DBPXA250 Development Platform"
 	select PXA25x
@@ -157,6 +160,10 @@ config MACH_TRIZEPS4
 	bool "Keith und Koep Trizeps4 DIMM-Module"
 	select PXA27x
 
+config MACH_TRIZEPS4_CONXS
+	bool "ConXS Eval Board"
+	depends on MACH_TRIZEPS4
+
 config MACH_EM_X270
 	bool "CompuLab EM-x270 platform"
 	select PXA27x
@@ -192,17 +199,10 @@ config MACH_PCM027
 	select IWMMXT
 	select PXA_SSP
 
-endmenu
-
-choice
-	prompt "Used baseboard"
-	depends on MACH_PCM027
-
 config MACH_PCM990_BASEBOARD
 	bool "PHYTEC PCM-990 development board"
 	select HAVE_PWM
-
-endchoice
+	depends on MACH_PCM027
 
 choice
 	prompt "display on pcm990"
@@ -219,34 +219,6 @@ config PCM990_DISPLAY_NONE
 
 endchoice
 
-if ARCH_GUMSTIX
-
-choice
-	prompt "Select target Gumstix board"
-
-config MACH_GUMSTIX_F
-	bool "Basix, Connex, ws-200ax, ws-400ax systems"
-	select PXA25x
-
-endchoice
-
-endif
-
-
-if MACH_TRIZEPS4
-
-choice
-	prompt "Select base board for Trizeps 4 module"
-
-config MACH_TRIZEPS4_CONXS
-	bool "ConXS Eval Board"
-
-config MACH_TRIZEPS4_ANY
-	bool "another Board"
-
-endchoice
-
-endif
 
 endmenu