summaryrefslogtreecommitdiffstats
path: root/sound/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 17:09:02 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 17:09:02 +0100
commit8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch)
treefb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/Kconfig
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (diff)
parent[ALSA] version 1.0.10rc3 (diff)
downloadlinux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.xz
linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/Kconfig')
-rw-r--r--sound/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index b65ee4701f98..d8f11408ce27 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -48,6 +48,14 @@ config SND
For more information, see <http://www.alsa-project.org/>
+config SND_AC97_CODEC
+ tristate
+ select SND_PCM
+ select SND_AC97_BUS
+
+config SND_AC97_BUS
+ tristate
+
source "sound/core/Kconfig"
source "sound/drivers/Kconfig"