diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 14:07:22 -0400 |
| commit | 1543966a079fc7065849ae43ca4dd767c188ad55 (patch) | |
| tree | 760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/input/touchscreen/Kconfig | |
| parent | 5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff) | |
| parent | 4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff) | |
Merge branch 'pxa-palm' into pxa-machines
Conflicts:
drivers/mfd/Kconfig
drivers/pcmcia/Makefile
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
| -rw-r--r-- | drivers/input/touchscreen/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 25287e80e236..6e1e8c624f9e 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig | |||
| @@ -220,6 +220,7 @@ config TOUCHSCREEN_ATMEL_TSADCC | |||
| 220 | config TOUCHSCREEN_UCB1400 | 220 | config TOUCHSCREEN_UCB1400 |
| 221 | tristate "Philips UCB1400 touchscreen" | 221 | tristate "Philips UCB1400 touchscreen" |
| 222 | select AC97_BUS | 222 | select AC97_BUS |
| 223 | depends on UCB1400_CORE | ||
| 223 | help | 224 | help |
| 224 | This enables support for the Philips UCB1400 touchscreen interface. | 225 | This enables support for the Philips UCB1400 touchscreen interface. |
| 225 | The UCB1400 is an AC97 audio codec. The touchscreen interface | 226 | The UCB1400 is an AC97 audio codec. The touchscreen interface |