From: Russell King Date: Wed, 9 Jul 2008 19:56:05 +0000 (+0100) Subject: Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa X-Git-Tag: v2.6.27-rc1~1095^2^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fdc614e873bc56ed15d8f4e9fa33516cd0915fc2;p=linux-2.6-omap-h63xx.git Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa --- fdc614e873bc56ed15d8f4e9fa33516cd0915fc2 diff --cc arch/arm/mach-pxa/Kconfig index 5da7a682049,03cbd0f7285,caccbbc41b4..914bb33dab9 --- a/arch/arm/mach-pxa/Kconfig +++ b/arch/arm/mach-pxa/Kconfig @@@@ -146,26 -149,42 -145,9 +148,25 @@@@ choic 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 PXA_SHARPSL - - choice - prompt "Select target Sharp Zaurus device range" - - config PXA_SHARPSL_25x - bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)" - select PXA25x - - config PXA_SHARPSL_27x - bool "Sharp PXA270 models (SL-Cxx00)" - select PXA27x - - endchoice - - endif - if ARCH_GUMSTIX choice