1 files changed, 11 insertions, 10 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 8627e718a61..0b7f145dd41 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -27,15 +27,20 @@ endmenu
 endif
 
 config ARCH_GUMSTIX
-        bool "Gumstix XScale boards"
+        bool "Gumstix XScale 255 boards"
+        select PXA25x
         help
-          Say Y here if you intend to run this kernel on a
-          Gumstix Full Function Minature Computer.
+          Say Y here if you intend to run this kernel on
+          Basix, Connex, ws-200ax, ws-400ax systems
 
-config MACH_GUMSTIX_F
-        bool "Basix, Connex, ws-200ax, ws-400ax systems"
+choice
+        prompt "Gumstix Carrier/Expansion Board"
         depends on ARCH_GUMSTIX
-        select PXA25x
+
+config GUMSTIX_AM200EPD
+        bool "Enable AM200EPD board support"
+
+endchoice
 
 config ARCH_LUBBOCK
         bool "Intel DBPXA250 Development Platform"
@@ -348,10 +353,6 @@ config PCM990_DISPLAY_NONE
 
 endchoice
 
-config MACH_AM200EPD
-        depends on MACH_GUMSTIX_F
-        bool "Enable AM200EPD board support"
-
 config PXA_EZX
         bool "Motorola EZX Platform"
         select PXA27x