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 9609a6c676bea96296a89cd479216dd7c6be38fd..26be90abecf35fe760c3cea39be8aca30e85ae23 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -75,6 +75,15 @@ config BACKLIGHT_HP680
          If you have a HP Jornada 680, say y to enable the
          backlight driver.
 
+config BACKLIGHT_OMAP
+       tristate "OMAP LCD Backlight"
+       depends on BACKLIGHT_CLASS_DEVICE && (ARCH_OMAP1 || ARCH_OMAP2)
+       default y
+       help
+         This driver controls the LCD backlight level and power
+         for the PWL module of OMAP processors.  Say Y if you plan
+         to use power saving.
+
 config BACKLIGHT_PROGEAR
        tristate "Frontpath ProGear Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE && PCI && X86