Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / video / backlight / Kconfig

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 7ed9991fa74785cb8d232954c10d0925caed59ab..2979292650d6494a5fddef3f3835da5931f37ec0 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -88,7 +88,7 @@ config LCD_PLATFORM
 
 config LCD_TOSA
        tristate "Sharp SL-6000 LCD Driver"
-       depends on SPI && MACH_TOSA
+       depends on I2C && SPI && MACH_TOSA
        help
          If you have an Sharp SL-6000 Zaurus say Y to enable a driver
          for its LCD.
@@ -184,6 +184,18 @@ config BACKLIGHT_GENERIC
          known as the Corgi backlight driver. If you have a Sharp Zaurus
          SL-C7xx, SL-Cxx00 or SL-6000x say y.
 
+config BACKLIGHT_LM3533
+       tristate "Backlight Driver for LM3533"
+       depends on BACKLIGHT_CLASS_DEVICE
+       depends on MFD_LM3533
+       help
+         Say Y to enable the backlight driver for National Semiconductor / TI
+         LM3533 Lighting Power chips.
+
+         The backlights can be controlled directly, through PWM input, or by
+         the ambient-light-sensor interface. The chip supports 256 brightness
+         levels.
+
 config BACKLIGHT_LOCOMO
        tristate "Sharp LOCOMO LCD/Backlight Driver"
        depends on SHARP_LOCOMO
@@ -245,6 +257,12 @@ config BACKLIGHT_DA903X
          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_DA9052
+       tristate "Dialog DA9052/DA9053 WLED"
+       depends on PMIC_DA9052
+       help
+         Enable the Backlight Driver for DA9052-BC and DA9053-AA/Bx PMICs.
+
 config BACKLIGHT_MAX8925
        tristate "Backlight driver for MAX8925"
        depends on MFD_MAX8925