Merge branch 'for-rmk' of git://git.android.com/kernel into devel

diff --combined arch/arm/Kconfig
index 6c73e963d976a017cfa50e6da27a66899fcfa99e,c8ac9941f1945d53b1d7ca9d92028869865a9120..6ea097f0890fd7f300ddf68afe5f2bd9974bd9a0
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -192,6 -192,8 +192,8 @@@ config VECTORS_BAS
  
  source "init/Kconfig"
  
+ source "kernel/Kconfig.freezer"
+ 
  menu "System Type"
  
  choice
@@@ -354,7 -356,7 +356,7 @@@ config ARCH_IXP4X
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
 -      select ZONE_DMA if PCI
 +      select DMABOUNCE if PCI
        help
          Support for Intel's IXP4XX (XScale) family of processors.
  
@@@ -538,16 -540,15 +540,15 @@@ config ARCH_OMA
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
  
- config ARCH_MSM7X00A
-       bool "Qualcomm MSM7X00A"
+ config ARCH_MSM
+       bool "Qualcomm MSM"
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
-         Support for Qualcomm MSM7X00A based systems.  This runs on the ARM11
-         apps processor of the MSM7X00A and depends on a shared memory
+         Support for Qualcomm MSM7K based systems.  This runs on the ARM11
+         apps processor of the MSM7K and depends on a shared memory
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
-         <http://www.cdmatech.com/products/msm7200_chipset_solution.jsp>
  
  endchoice
  

diff --combined drivers/input/touchscreen/Kconfig
index dff4adca6475b04229ab93bca642f8c438fc8f0f,8317fdef1691c0bb4c564116c8b27c75e24b561e..3d1ab8fa9accb88e341f4d66748c7cf0b09db3f0
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -42,9 -42,8 +42,9 @@@ config TOUCHSCREEN_BITS
          module will be called h3600_ts_input.
  
  config TOUCHSCREEN_CORGI
 -      tristate "SharpSL (Corgi and Spitz series) touchscreen driver"
 +      tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)"
        depends on PXA_SHARPSL
 +      select CORGI_SSP_DEPRECATED
        default y
        help
          Say Y here to enable the driver for the touchscreen on the
@@@ -55,9 -54,6 +55,9 @@@
          To compile this driver as a module, choose M here: the
          module will be called corgi_ts.
  
 +        NOTE: this driver is deprecated, try enable SPI and generic
 +        ADS7846-based touchscreen driver.
 +
  config TOUCHSCREEN_FUJITSU
        tristate "Fujitsu serial touchscreen"
        select SERIO
@@@ -223,7 -219,7 +223,7 @@@ config TOUCHSCREEN_ATMEL_TSADC
  
  config TOUCHSCREEN_UCB1400
        tristate "Philips UCB1400 touchscreen"
-       select AC97_BUS
+       depends on AC97_BUS
        depends on UCB1400_CORE
        help
          This enables support for the Philips UCB1400 touchscreen interface.