diff options
author | Nicolas Pitre | 2006-12-12 19:32:29 +0100 |
---|---|---|
committer | Linus Torvalds | 2006-12-12 19:43:21 +0100 |
commit | e1036502e5263851259d147771226161e5ccc85a (patch) | |
tree | 46a88e0b23dbb1df5d38e6b210d09641974274e9 /drivers | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | kernel-qcow2-linux-e1036502e5263851259d147771226161e5ccc85a.tar.gz kernel-qcow2-linux-e1036502e5263851259d147771226161e5ccc85a.tar.xz kernel-qcow2-linux-e1036502e5263851259d147771226161e5ccc85a.zip |
[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem
Commit 2d4ba4a3b9aef95d328d74a17ae84f8d658059e2 introduced a dependency
that was never meant to exist when the ac97_bus.c module was created.
Move ac97_bus.c up the directory hierarchy to make sure it is built when
selected even if sound is configured out so things work as originally
intended.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/touchscreen/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index 3d5f19658032..6b46c9bf1d20 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -146,7 +146,7 @@ config TOUCHSCREEN_TOUCHWIN config TOUCHSCREEN_UCB1400 tristate "Philips UCB1400 touchscreen" - depends on SND_AC97_BUS + select AC97_BUS help This enables support for the Philips UCB1400 touchscreen interface. The UCB1400 is an AC97 audio codec. The touchscreen interface |