Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / video / backlight / Kconfig

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 26be90abecf35fe760c3cea39be8aca30e85ae23..40b9b1ad3b5d1673bf0d1ca8b2bf221c5040f612 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -50,6 +50,19 @@ config BACKLIGHT_CLASS_DEVICE
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 
+config BACKLIGHT_ATMEL_LCDC
+       bool "Atmel LCDC Contrast-as-Backlight control"
+       depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL
+       default y if MACH_SAM9261EK || MACH_SAM9263EK
+       help
+         This provides a backlight control internal to the Atmel LCDC
+         driver.  If the LCD "contrast control" on your board is wired
+         so it controls the backlight brightness, select this option to
+         export this as a PWM-based backlight control.
+
+         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_CORGI
        tristate "Generic (aka Sharp Corgi) Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE
@@ -67,6 +80,15 @@ config BACKLIGHT_LOCOMO
          If you have a Sharp Zaurus SL-5500 (Collie) or SL-5600 (Poodle) say y to
          enable the LCD/backlight driver.
 
+config BACKLIGHT_OMAP1
+       tristate "OMAP1 PWL-based LCD Backlight"
+       depends on BACKLIGHT_CLASS_DEVICE && ARCH_OMAP1
+       default y
+       help
+         This driver controls the LCD backlight level and power for
+         the PWL module of OMAP1 processors.  Say Y if your board
+         uses this hardware.
+
 config BACKLIGHT_HP680
        tristate "HP Jornada 680 Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE && SH_HP6XX