Merge branch 'linus' into pci-for-jesse

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

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 924e2551044aee6b1f3e84b547c702ac30690412..30bf7f2f163599b8c3a5aa1d5c2d0cce1ef20193 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -80,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
@@ -103,3 +112,10 @@ config BACKLIGHT_CARILLO_RANCH
        help
          If you have a Intel LE80578 (Carillo Ranch) say Y to enable the
          backlight driver.
+
+config BACKLIGHT_PWM
+       tristate "Generic PWM based Backlight Driver"
+       depends on BACKLIGHT_CLASS_DEVICE && HAVE_PWM
+       help
+         If you have a LCD backlight adjustable by PWM, say Y to enable
+         this driver.