Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 51c94a5971b4e9e7401835126e47b404879f75c4..4a4dd9adc328cfc63f797cd2d785c14ed8082259 100644 (file)
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -124,7 +124,7 @@ config BACKLIGHT_ATMEL_PWM
          called atmel-pwm-bl.
 
 config BACKLIGHT_CORGI
-       tristate "Generic (aka Sharp Corgi) Backlight Driver"
+       tristate "Generic (aka Sharp Corgi) Backlight Driver (DEPRECATED)"
        depends on BACKLIGHT_CLASS_DEVICE
        default n
        help
@@ -132,6 +132,9 @@ config BACKLIGHT_CORGI
          known as the Corgi backlight driver. If you have a Sharp Zaurus
          SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n.
 
+         Note: this driver is marked as deprecated, try enable SPI and
+         use the new corgi_lcd driver with integrated backlight control
+
 config BACKLIGHT_LOCOMO
        tristate "Sharp LOCOMO LCD/Backlight Driver"
        depends on BACKLIGHT_CLASS_DEVICE && SHARP_LOCOMO