summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-22 19:33:50 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-22 19:33:50 +0100
commitbcbfe664e7af019e698cef2feb85ac2b4f1ac11d (patch)
treebade11b3088e3768612ecb2cd6e285ab67a23286 /drivers/video
parentf6335c43f3d7816ba2e69abce4f29c41f65bb27e (diff)
parent175854be81dc42b70591760c193113e4898b3e6f (diff)
downloadkernel-common-bcbfe664e7af019e698cef2feb85ac2b4f1ac11d.tar.gz
kernel-common-bcbfe664e7af019e698cef2feb85ac2b4f1ac11d.tar.bz2
kernel-common-bcbfe664e7af019e698cef2feb85ac2b4f1ac11d.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/backlight/Kconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index c72a13562954..1495a8136fcc 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -115,14 +115,18 @@ 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
+ select CORGI_SSP_DEPRECATED
default n
help
Say y to enable the generic platform backlight driver previously
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