Merge branch 'linus' into oprofile-v2

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

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 452b770d8cc9a51f8c32261eb4247f14e515ab48..c72a13562954d2d404bea84f810fc1d1a590dd4d 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -24,6 +24,13 @@ config LCD_CLASS_DEVICE
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 
          To have support for your specific LCD panel you will have to
          select the proper drivers which depend on this option.
 

+config LCD_CORGI
+       tristate "LCD Panel support for SHARP corgi/spitz model"
+       depends on LCD_CLASS_DEVICE && SPI_MASTER && PXA_SHARPSL
+       help
+         Say y here to support the LCD panels usually found on SHARP
+         corgi (C7x0) and spitz (Cxx00) models.
+

 config LCD_LTV350QV
        tristate "Samsung LTV350QV LCD Panel"
        depends on LCD_CLASS_DEVICE && SPI_MASTER
 config LCD_LTV350QV
        tristate "Samsung LTV350QV LCD Panel"
        depends on LCD_CLASS_DEVICE && SPI_MASTER


@@ -44,6 +51,14 @@ config LCD_ILI9320
          If you have a panel based on the ILI9320 controller chip
          then say y to include a power driver for it.
 
          If you have a panel based on the ILI9320 controller chip
          then say y to include a power driver for it.
 

+config LCD_TDO24M
+       tristate "Toppoly TDO24M LCD Panels support"
+       depends on LCD_CLASS_DEVICE && SPI_MASTER
+       default n
+       help
+         If you have a Toppoly TDO24M series LCD panel, say y here to
+         include the support for it.
+

 config LCD_VGG2432A4
        tristate "VGG2432A4 LCM device support"
        depends on BACKLIGHT_LCD_SUPPORT && LCD_CLASS_DEVICE && SPI_MASTER
 config LCD_VGG2432A4
        tristate "VGG2432A4 LCM device support"
        depends on BACKLIGHT_LCD_SUPPORT && LCD_CLASS_DEVICE && SPI_MASTER