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 caccbbc..914bb33 100644 (file)
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -36,10 +36,12 @@ config ARCH_LUBBOCK
 config MACH_LOGICPD_PXA270
        bool "LogicPD PXA270 Card Engine Development Platform"
        select PXA27x
+       select HAVE_PWM
 
 config MACH_MAINSTONE
        bool "Intel HCDDBBVA0 Development Platform"
        select PXA27x
+       select HAVE_PWM
 
 config ARCH_PXA_IDP
        bool "Accelent Xscale IDP"
@@ -115,6 +117,7 @@ config MACH_COLIBRI
 config MACH_ZYLONITE
        bool "PXA3xx Development Platform"
        select PXA3xx
+       select HAVE_PWM
 
 config MACH_LITTLETON
        bool "PXA3xx Form Factor Platform (aka Littleton)"
@@ -145,6 +148,22 @@ choice
 
 config MACH_PCM990_BASEBOARD
        bool "PHYTEC PCM-990 development board"
+       select HAVE_PWM
+
+endchoice
+
+choice
+       prompt "display on pcm990"
+       depends on MACH_PCM990_BASEBOARD
+
+config PCM990_DISPLAY_SHARP
+       bool "sharp lq084v1dg21 stn display"
+
+config PCM990_DISPLAY_NEC
+       bool "nec nl6448bc20_18d tft display"
+
+config PCM990_DISPLAY_NONE
+       bool "no display"
 
 endchoice
 
@@ -263,4 +282,10 @@ config PXA_SSP
        tristate
        help
          Enable support for PXA2xx SSP ports
+
+config PXA_PWM
+       tristate
+       default BACKLIGHT_PWM
+       help
+         Enable support for PXA2xx/PXA3xx PWM controllers
 endif