diff options
author | Eric Miao <eric.miao@marvell.com> | 2008-10-20 23:36:19 -0400 |
---|---|---|
committer | Eric Miao <eric.miao@marvell.com> | 2008-10-20 23:36:19 -0400 |
commit | 45e2a9b48538ac7ce4ed557f31a0618782a72aa1 (patch) | |
tree | cfeab1d0b8f4ab18db71feb406ef2b510c08e452 /drivers | |
parent | 25af3b0f757d4ce833c1df9b64b7357a9fc8f4a5 (diff) |
[ARM] pxa: fix the corgi_ssp.c dependency issue in {corgi,spitz}_defconfig
Separate building of corgi_ssp.c, and introduce a new hidden config option
CONFIG_CORGI_SSP_DEPRECATED for this. Aslo mark corgi_ts.c and corgi_bl.c
as deprecated.
This unbreaks the legacy configs in {corgi,spitz}_defconfig, however, SPI
based ADS7846 touchscreen driver and a new SPI-based corgi_lcd.c driver
with integrated backlight support are recommended.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 6 | ||||
-rw-r--r-- | drivers/video/backlight/Kconfig | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 6e1e8c624f9e..dff4adca6475 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
@@ -42,8 +42,9 @@ config TOUCHSCREEN_BITSY | |||
42 | module will be called h3600_ts_input. | 42 | module will be called h3600_ts_input. |
43 | 43 | ||
44 | config TOUCHSCREEN_CORGI | 44 | config TOUCHSCREEN_CORGI |
45 | tristate "SharpSL (Corgi and Spitz series) touchscreen driver" | 45 | tristate "SharpSL (Corgi and Spitz series) touchscreen driver (DEPRECATED)" |
46 | depends on PXA_SHARPSL | 46 | depends on PXA_SHARPSL |
47 | select CORGI_SSP_DEPRECATED | ||
47 | default y | 48 | default y |
48 | help | 49 | help |
49 | Say Y here to enable the driver for the touchscreen on the | 50 | Say Y here to enable the driver for the touchscreen on the |
@@ -54,6 +55,9 @@ config TOUCHSCREEN_CORGI | |||
54 | To compile this driver as a module, choose M here: the | 55 | To compile this driver as a module, choose M here: the |
55 | module will be called corgi_ts. | 56 | module will be called corgi_ts. |
56 | 57 | ||
58 | NOTE: this driver is deprecated, try enable SPI and generic | ||
59 | ADS7846-based touchscreen driver. | ||
60 | |||
57 | config TOUCHSCREEN_FUJITSU | 61 | config TOUCHSCREEN_FUJITSU |
58 | tristate "Fujitsu serial touchscreen" | 62 | tristate "Fujitsu serial touchscreen" |
59 | select SERIO | 63 | select SERIO |
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 | |||
115 | called atmel-pwm-bl. | 115 | called atmel-pwm-bl. |
116 | 116 | ||
117 | config BACKLIGHT_CORGI | 117 | config BACKLIGHT_CORGI |
118 | tristate "Generic (aka Sharp Corgi) Backlight Driver" | 118 | tristate "Generic (aka Sharp Corgi) Backlight Driver (DEPRECATED)" |
119 | depends on BACKLIGHT_CLASS_DEVICE | 119 | depends on BACKLIGHT_CLASS_DEVICE |
120 | select CORGI_SSP_DEPRECATED | ||
120 | default n | 121 | default n |
121 | help | 122 | help |
122 | Say y to enable the generic platform backlight driver previously | 123 | Say y to enable the generic platform backlight driver previously |
123 | known as the Corgi backlight driver. If you have a Sharp Zaurus | 124 | known as the Corgi backlight driver. If you have a Sharp Zaurus |
124 | SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n. | 125 | SL-C7xx, SL-Cxx00 or SL-6000x say y. Most users can say n. |
125 | 126 | ||
127 | Note: this driver is marked as deprecated, try enable SPI and | ||
128 | use the new corgi_lcd driver with integrated backlight control | ||
129 | |||
126 | config BACKLIGHT_LOCOMO | 130 | config BACKLIGHT_LOCOMO |
127 | tristate "Sharp LOCOMO LCD/Backlight Driver" | 131 | tristate "Sharp LOCOMO LCD/Backlight Driver" |
128 | depends on BACKLIGHT_CLASS_DEVICE && SHARP_LOCOMO | 132 | depends on BACKLIGHT_CLASS_DEVICE && SHARP_LOCOMO |