From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 23 Oct 2008 23:06:49 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
X-Git-Tag: v2.6.28-rc1~7
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0d876c6a96e2cabf8632e8066b617d9c2dec9518;hp=-c;p=linux-2.6-omap-h63xx.git

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"
---

0d876c6a96e2cabf8632e8066b617d9c2dec9518
diff --combined arch/arm/Kconfig
index f504c801792,6ea097f0890..5021db2217e
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -540,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
  
@@@ -1256,8 -1255,6 +1255,8 @@@ source "drivers/hid/Kconfig
  
  source "drivers/usb/Kconfig"
  
 +source "drivers/uwb/Kconfig"
 +
  source "drivers/mmc/Kconfig"
  
  source "drivers/memstick/Kconfig"
diff --combined drivers/video/backlight/Kconfig
index 51c94a5971b,a339e7f6067..4a4dd9adc32
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@@ -75,15 -75,6 +75,15 @@@ config LCD_PLATFOR
  	  This driver provides a platform-device registered LCD power
  	  control interface.
  
 +config LCD_TOSA
 +	tristate "Sharp SL-6000 LCD Driver"
 +	depends on LCD_CLASS_DEVICE && SPI
 +	depends on MACH_TOSA
 +	default n
 +	help
 +	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver
 +	  for its LCD.
 +
  #
  # Backlight
  #
@@@ -124,7 -115,7 +124,7 @@@ config BACKLIGHT_ATMEL_PW
  	  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 -123,9 +132,9 @@@
  	  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
@@@ -180,13 -174,6 +183,13 @@@ config BACKLIGHT_PW
  	  If you have a LCD backlight adjustable by PWM, say Y to enable
  	  this driver.
  
 +config BACKLIGHT_DA903X
 +	tristate "Backlight Driver for DA9030/DA9034 using WLED"
 +	depends on BACKLIGHT_CLASS_DEVICE && PMIC_DA903X
 +	help
 +	  If you have a LCD backlight connected to the WLED output of DA9030
 +	  or DA9034 WLED output, say Y here to enable this driver.
 +
  config BACKLIGHT_MBP_NVIDIA
         tristate "MacBook Pro Nvidia Backlight Driver"
         depends on BACKLIGHT_CLASS_DEVICE && X86
@@@ -195,19 -182,3 +198,19 @@@
           If you have an Apple Macbook Pro with Nvidia graphics hardware say Y
  	 to enable a driver for its backlight
  
 +config BACKLIGHT_TOSA
 +	tristate "Sharp SL-6000 Backlight Driver"
 +	depends on BACKLIGHT_CLASS_DEVICE && I2C
 +	depends on MACH_TOSA && LCD_TOSA
 +	default n
 +	help
 +	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver
 +	  for its backlight
 +
 +config BACKLIGHT_SAHARA
 +	tristate "Tabletkiosk Sahara Touch-iT Backlight Driver"
 +	depends on BACKLIGHT_CLASS_DEVICE && X86
 +	default n
 +	help
 +	  If you have a Tabletkiosk Sahara Touch-iT, say y to enable the
 +	  backlight driver.