Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[pandora-kernel.git] / arch / arm / mach-pxa / Kconfig

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 7db0fd8..914bb33 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -20,8 +20,7 @@ endmenu
 
 endif
 
-choice
-       prompt "Select target board"
+menu "Select target boards"
 
 config ARCH_GUMSTIX
        bool "Gumstix XScale boards"
@@ -141,7 +140,7 @@ config MACH_PCM027
        select PXA27x
        select IWMMXT
 
-endchoice
+endmenu
 
 choice
        prompt "Used baseboard"
@@ -149,25 +148,24 @@ choice
 
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
+       select HAVE_PWM
 
 endchoice
 
-if PXA_SHARPSL
-
 choice
-       prompt "Select target Sharp Zaurus device range"
+       prompt "display on pcm990"
+       depends on MACH_PCM990_BASEBOARD
 
-config PXA_SHARPSL_25x
-       bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
-       select PXA25x
+config PCM990_DISPLAY_SHARP
+       bool "sharp lq084v1dg21 stn display"
 
-config PXA_SHARPSL_27x
-       bool "Sharp PXA270 models (SL-Cxx00)"
-       select PXA27x
+config PCM990_DISPLAY_NEC
+       bool "nec nl6448bc20_18d tft display"
 
-endchoice
+config PCM990_DISPLAY_NONE
+       bool "no display"
 
-endif
+endchoice
 
 if ARCH_GUMSTIX
 
@@ -202,28 +200,33 @@ endmenu
 
 config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select SHARP_LOCOMO
        select PXA_SSP
 
 config MACH_CORGI
        bool "Enable Sharp SL-C700 (Corgi) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_SHEPHERD
        bool "Enable Sharp SL-C750 (Shepherd) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_HUSKY
        bool "Enable Sharp SL-C760 (Husky) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
        select PXA_SHARP_C7xx
 
 config MACH_AKITA
        bool "Enable Sharp SL-1000 (Akita) Support"
-       depends on PXA_SHARPSL_27x
+       depends on PXA_SHARPSL
+       select PXA27x
        select PXA_SHARP_Cxx00
        select MACH_SPITZ
        select I2C
@@ -231,17 +234,20 @@ config MACH_AKITA
 
 config MACH_SPITZ
        bool "Enable Sharp Zaurus SL-3000 (Spitz) Support"
-       depends on PXA_SHARPSL_27x
+       depends on PXA_SHARPSL
+       select PXA27x
        select PXA_SHARP_Cxx00
 
 config MACH_BORZOI
        bool "Enable Sharp Zaurus SL-3100 (Borzoi) Support"
-       depends on PXA_SHARPSL_27x
+       depends on PXA_SHARPSL
+       select PXA27x
        select PXA_SHARP_Cxx00
 
 config MACH_TOSA
        bool "Enable Sharp SL-6000x (Tosa) Support"
-       depends on PXA_SHARPSL_25x
+       depends on PXA_SHARPSL
+       select PXA25x
 
 config PXA25x
        bool