Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight:
  backlight: Fix missing kernel doc entry
  backlight: Add Nvidia-based Apple Macbook Pro backlight driver

diff --combined drivers/video/backlight/Kconfig
index 98d9faf4970d23e78b7e9686e90c6fed0ad369c7,62547bd2ea4955f30db8e132a7bca4fd7febd425..452b770d8cc9a51f8c32261eb4247f14e515ab48
--- 1/drivers/video/backlight/Kconfig
--- 2/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@@ -36,30 -36,6 +36,30 @@@ config LCD_LTV350Q
  
          The LTV350QV panel is present on all ATSTK1000 boards.
  
 +config LCD_ILI9320
 +      tristate
 +      depends on LCD_CLASS_DEVICE && BACKLIGHT_LCD_SUPPORT
 +      default n
 +      help
 +        If you have a panel based on the ILI9320 controller chip
 +        then say y to include a power driver for it.
 +
 +config LCD_VGG2432A4
 +      tristate "VGG2432A4 LCM device support"
 +      depends on BACKLIGHT_LCD_SUPPORT && LCD_CLASS_DEVICE && SPI_MASTER
 +      select LCD_ILI9320
 +      default n
 +      help
 +        If you have a VGG2432A4 panel based on the ILI9320 controller chip
 +        then say y to include a power driver for it.
 +
 +config LCD_PLATFORM
 +      tristate "Platform LCD controls"
 +      depends on LCD_CLASS_DEVICE
 +      help
 +        This driver provides a platform-device registered LCD power
 +        control interface.
 +
  #
  # Backlight
  #
@@@ -87,18 -63,6 +87,18 @@@ config BACKLIGHT_ATMEL_LCD
          If in doubt, it's safe to enable this option; it doesn't kick
          in unless the board's description says it's wired that way.
  
 +config BACKLIGHT_ATMEL_PWM
 +      tristate "Atmel PWM backlight control"
 +      depends on BACKLIGHT_CLASS_DEVICE && ATMEL_PWM
 +      default n
 +      help
 +        Say Y here if you want to use the PWM peripheral in Atmel AT91 and
 +        AVR32 devices. This driver will need additional platform data to know
 +        which PWM instance to use and how to configure it.
 +
 +        To compile this driver as a module, choose M here: the module will be
 +        called atmel-pwm-bl.
 +
  config BACKLIGHT_CORGI
        tristate "Generic (aka Sharp Corgi) Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE
@@@ -155,3 -119,12 +155,12 @@@ config BACKLIGHT_PW
        help
          If you have a LCD backlight adjustable by PWM, say Y to enable
          this driver.
+ 
+ config BACKLIGHT_MBP_NVIDIA
+        tristate "MacBook Pro Nvidia Backlight Driver"
+        depends on BACKLIGHT_CLASS_DEVICE && X86
+        default n
+        help
+          If you have an Apple Macbook Pro with Nvidia graphics hardware say Y
+        to enable a driver for its backlight
+ 

diff --combined drivers/video/backlight/Makefile
index d8a08e468cc74594e3dbed84b15af1f2feaffd48,c7c4d95fdc1c7dbf53d1e37aa8f7196f3d389043..b405aace803fe829a1e82192215926b3a1733753
--- 1/drivers/video/backlight/Makefile
--- 2/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@@ -1,13 -1,9 +1,13 @@@
  # Backlight & LCD drivers
  
  obj-$(CONFIG_LCD_CLASS_DEVICE)     += lcd.o
 -obj-$(CONFIG_LCD_LTV350QV)    += ltv350qv.o
 +obj-$(CONFIG_LCD_LTV350QV)       += ltv350qv.o
 +obj-$(CONFIG_LCD_ILI9320)        += ili9320.o
 +obj-$(CONFIG_LCD_PLATFORM)       += platform_lcd.o
 +obj-$(CONFIG_LCD_VGG2432A4)      += vgg2432a4.o
  
  obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 +obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
  obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o
  obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
  obj-$(CONFIG_BACKLIGHT_LOCOMO)        += locomolcd.o
@@@ -15,3 -11,5 +15,5 @@@ obj-$(CONFIG_BACKLIGHT_OMAP1) += omap1_
  obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o
  obj-$(CONFIG_BACKLIGHT_CARILLO_RANCH) += cr_bllcd.o
  obj-$(CONFIG_BACKLIGHT_PWM)   += pwm_bl.o
+ obj-$(CONFIG_BACKLIGHT_MBP_NVIDIA) += mbp_nvidia_bl.o
+