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: Add driver for Tabletkiosk Sahara TouchIT-213 Tablet PC
  backlight: da903x: Add backlight driver for DA9030/DA9034
  tosa: add support for bl/lcd driver
  backlight: add support for Sharp SL-6000 LCD and backlight drivers

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index c72a13562954..51c94a5971b4 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -75,6 +75,15 @@ config LCD_PLATFORM
           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
 #
@@ -171,6 +180,13 @@ config BACKLIGHT_PWM
           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
@@ -179,3 +195,19 @@ config BACKLIGHT_MBP_NVIDIA
          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.