Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

diff --combined arch/arm/mach-pxa/Kconfig
index f781873431f39b52bb83f1301ce32a13eae1bb3e,99b669b924d7344dec8f016d6c66f68c69f64c13..a062235e83a8b4c3b272c3d7af016d85dcd8b2ba
--- 1/arch/arm/mach-pxa/Kconfig
--- 2/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@@ -71,6 -71,14 +71,14 @@@ config PXA_SHARPS
          SL-C3000 (Spitz), SL-C3100 (Borzoi) or SL-C6000x (Tosa)
          handheld computer.
  
+ config CORGI_SSP_DEPRECATED
+       bool
+       select PXA_SSP
+       help
+         This option will include corgi_ssp.c and corgi_lcd.c
+         that corgi_ts.c and other legacy drivers (corgi_bl.c
+         and sharpsl_pm.c) may depend on.
+ 
  config MACH_POODLE
        bool "Enable Sharp SL-5600 (Poodle) Support"
        depends on PXA_SHARPSL
@@@ -257,6 -265,7 +265,6 @@@ config MACH_ARMCOR
        bool "CompuLab CM-X255/CM-X270 modules"
        select PXA27x
        select IWMMXT
 -      select ZONE_DMA if PCI
        select PXA25x
        select PXA_SSP