Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / video / backlight / Kconfig

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index db10d0120d2be713a75bdc72c7ce74d484e9a013..2e166c3fc4c354c1184343b265d17ef02f6c212f 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -59,6 +59,13 @@ config LCD_LTV350QV
 
          The LTV350QV panel is present on all ATSTK1000 boards.
 
+config LCD_ILI922X
+       tristate "ILI Technology ILI9221/ILI9222 support"
+       depends on SPI
+       help
+         If you have a panel based on the ILI9221/9222 controller
+         chip then say y to include a driver for it.
+
 config LCD_ILI9320
        tristate "ILI Technology ILI9320 controller support"
        depends on SPI
@@ -161,7 +168,7 @@ if BACKLIGHT_CLASS_DEVICE
 config BACKLIGHT_ATMEL_LCDC
        bool "Atmel LCDC Contrast-as-Backlight control"
        depends on FB_ATMEL
-       default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK
+       default y if MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK
        help
          This provides a backlight control internal to the Atmel LCDC
          driver.  If the LCD "contrast control" on your board is wired