Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] pxa: corgi backlight driver should not select ssp drivers
  [ARM] 5321/1: Kirkwood: fix typo in Makefile
  [ARM] 5320/1: fix assembly constraints in implementation of do_div()
  [ARM] 5318/1: Swap the PRRR and NMRR values in proc-v7.S
  [ARM] 5316/1: AT91: oops (regression) fix on gpio irq
  [ARM] msm: vreg interface to msm7k pmic
  [ARM] msm: dma: various basic dma improvements and bugfixes
  [ARM] msm: clock: provide clk_*() api support for
  [ARM] msm: clean up iomap and devices
  [ARM] msm: add proc_comm support, necessary for clock and power control
  [ARM] msm: rename ARCH_MSM7X00A to ARCH_MSM
  [ARM] pxa/spitz: fix unbalance parenthesis in header file spitz.h
  [ARM] pxa: update {corgi,spitz}_defconfig to favor SPI-based drivers
  [ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
  Revert "[ARM] pxa/corgi: remove now unused corgi_ssp.c and corgi_lcd.c"

2 files changed, 9 insertions, 2 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 8317fdef1691..3d1ab8fa9acc 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -42,8 +42,9 @@ config TOUCHSCREEN_BITSY
           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
@@ -54,6 +55,9 @@ config TOUCHSCREEN_CORGI
           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
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 51c94a5971b4..4a4dd9adc328 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -124,7 +124,7 @@ config BACKLIGHT_ATMEL_PWM
           called atmel-pwm-bl.
 
 config BACKLIGHT_CORGI
-        tristate "Generic (aka Sharp Corgi) Backlight Driver"
+        tristate "Generic (aka Sharp Corgi) Backlight Driver (DEPRECATED)"
         depends on BACKLIGHT_CLASS_DEVICE
         default n
         help
@@ -132,6 +132,9 @@ config BACKLIGHT_CORGI
           known as the Corgi backlight driver. If you have a Sharp Zaurus
           SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n.
 
+          Note: this driver is marked as deprecated, try enable SPI and
+          use the new corgi_lcd driver with integrated backlight control
+
 config BACKLIGHT_LOCOMO
         tristate "Sharp LOCOMO LCD/Backlight Driver"
         depends on BACKLIGHT_CLASS_DEVICE && SHARP_LOCOMO