summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:07:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:07:22 +0100
commit1543966a079fc7065849ae43ca4dd767c188ad55 (patch)
tree760ddb82836a4e3edf314227c731d5dc181d11a7 /drivers/input/touchscreen/Kconfig
parent5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff)
parent4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff)
downloadkernel-crypto-1543966a079fc7065849ae43ca4dd767c188ad55.tar.gz
kernel-crypto-1543966a079fc7065849ae43ca4dd767c188ad55.tar.xz
kernel-crypto-1543966a079fc7065849ae43ca4dd767c188ad55.zip
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/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 25287e80e23..6e1e8c624f9 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -220,6 +220,7 @@ config TOUCHSCREEN_ATMEL_TSADCC
config TOUCHSCREEN_UCB1400
tristate "Philips UCB1400 touchscreen"
select AC97_BUS
+ depends on UCB1400_CORE
help
This enables support for the Philips UCB1400 touchscreen interface.
The UCB1400 is an AC97 audio codec. The touchscreen interface