Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[sfrench/cifs-2.6.git] / drivers / video / backlight / Kconfig

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 22a49944d98da4a80686b652c3f9d8b3b370c741..09bfa9662e4d9fd8cf032e0f30d2cca19cc20b2b 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -117,7 +117,7 @@ config BACKLIGHT_CLASS_DEVICE
 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
+       default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK
        help
          This provides a backlight control internal to the Atmel LCDC
          driver.  If the LCD "contrast control" on your board is wired
@@ -251,3 +251,14 @@ config BACKLIGHT_ADX
        help
          Say Y to enable the backlight driver on Avionic Design Xanthos-based
          boards.
+
+config BACKLIGHT_ADP5520
+       tristate "Backlight Driver for ADP5520/ADP5501 using WLED"
+       depends on BACKLIGHT_CLASS_DEVICE && PMIC_ADP5520
+       help
+         If you have a LCD backlight connected to the BST/BL_SNK output of
+         ADP5520 or ADP5501, say Y here to enable this driver.
+
+         To compile this driver as a module, choose M here: the module will
+         be called adp5520_bl.
+