Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxa

diff --cc arch/arm/mach-pxa/Kconfig
index 5da7a68204920c5c67a26f8003f80ffd168e48cc,03cbd0f7285b415475a853efff7b93512543edd2,caccbbc41b43d349b07a4192c99eaa8e53bf4756..914bb33dab920e4deaff4f890916d8b3a140aee5
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
--- 3/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"
-  if PXA_SHARPSL
-  
+ +     select HAVE_PWM
  +
  +endchoice
  +
-       prompt "Select target Sharp Zaurus device range"
  +choice
-  config PXA_SHARPSL_25x
-       bool "Sharp PXA25x models (SL-5600, SL-C7xx and SL-C6000x)"
-       select PXA25x
+ +     prompt "display on pcm990"
+ +     depends on MACH_PCM990_BASEBOARD
  +
-  config PXA_SHARPSL_27x
-       bool "Sharp PXA270 models (SL-Cxx00)"
-       select PXA27x
+ +config PCM990_DISPLAY_SHARP
+ +     bool "sharp lq084v1dg21 stn display"
  +
-  endchoice
+ +config PCM990_DISPLAY_NEC
+ +     bool "nec nl6448bc20_18d tft display"
  +
+ +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

diff --cc arch/arm/mach-pxa/clock.c
Simple merge

diff --cc arch/arm/mach-pxa/devices.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/magician.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa25x.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa27x.c
Simple merge

diff --cc arch/arm/mach-pxa/pxa3xx.c
Simple merge

diff --cc drivers/i2c/busses/i2c-pxa.c
Simple merge